You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/09/10 08:39:49 UTC
[40/40] git commit: Merge branch '4.3' into 4.4
Merge branch '4.3' into 4.4
Conflicts:
source/accounts.rst
source/service_offerings.rst
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/6507638e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/6507638e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/6507638e
Branch: refs/heads/4.4
Commit: 6507638eccd62faa27846031cda9948fff8899b4
Parents: 00c90ec 5d59a37
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Wed Sep 10 12:08:26 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Wed Sep 10 12:08:26 2014 +0530
----------------------------------------------------------------------
.gitattributes | 2 +
source/accounts.rst | 10 +-
source/locale/zh_CN/LC_MESSAGES/networking2.mo | Bin 0 -> 286127 bytes
source/locale/zh_CN/LC_MESSAGES/networking2.po | 8448 +++++++++++++++++++
4 files changed, 8457 insertions(+), 3 deletions(-)
----------------------------------------------------------------------