Merge branch 'master' into internallb1
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3f2a62c7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3f2a62c7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3f2a62c7 Branch: refs/heads/internallb Commit: 3f2a62c7f62d23da23f65ff3842049243ef268e3 Parents: 20beb7a a0b5ebc Author: Alena Prokharchyk <[email protected]> Authored: Wed Apr 10 17:16:07 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Wed Apr 10 17:16:07 2013 -0700 ---------------------------------------------------------------------- .../com/cloud/bridge/service/EC2RestServlet.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
