You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/12/06 19:53:29 UTC
[1/3] git commit: Merge branch '4.0' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into 4.0
Updated Branches:
refs/heads/4.0 337d01ddc -> 5f025138e
Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into 4.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5f025138
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5f025138
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5f025138
Branch: refs/heads/4.0
Commit: 5f025138e82f9c8ae54aabc215d06e2e5ed5b606
Parents: ee9c804 337d01d
Author: David Nalley <da...@gnsa.us>
Authored: Thu Dec 6 13:53:00 2012 -0500
Committer: David Nalley <da...@gnsa.us>
Committed: Thu Dec 6 13:53:00 2012 -0500
----------------------------------------------------------------------
.../classes/resources/messages_fr_FR.properties | 412 +++++++-------
debian/cloud-client.install | 1 +
debian/control | 2 +-
debian/rules | 4 +-
.../debian/config/etc/init.d/cloud-early-config | 7 +-
server/src/com/cloud/api/ApiServer.java | 6 +-
ui/images/citrix-logo-darkbg.png | Bin 2799 -> 0 bytes
ui/images/logo-cloudplatform.png | Bin 1726 -> 0 bytes
ui/images/logo-login.png | Bin 8923 -> 0 bytes
9 files changed, 221 insertions(+), 211 deletions(-)
----------------------------------------------------------------------