incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [31/50] [abbrv] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Date Mon, 10 Sep 2012 20:55:52 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1b6a9344
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1b6a9344
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1b6a9344

Branch: refs/heads/4.0
Commit: 1b6a93444655d2f96d11ffaa6f07d073cf9f49af
Parents: 831ade7 0ae1d58
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Sat Sep 8 12:10:36 2012 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Sat Sep 8 12:10:36 2012 +0530

----------------------------------------------------------------------
 LICENSE                                            |    2 +-
 NOTICE                                             |  365 +++---
 agent/bindir/mycloud-setup-agent                   |  153 --
 agent/doc/README-iscsi.txt                         |  247 ---
 agent/doc/README.txt                               |  211 ---
 .../ConsoleProxyAuthenticationResult.java          |  128 +-
 .../src/com/cloud/bridge/model/BucketPolicyVO.java |   16 +
 .../cloud/bridge/model/CloudStackAccountVO.java    |   16 +
 .../bridge/model/CloudStackConfigurationVO.java    |   16 +
 .../bridge/model/CloudStackServiceOfferingVO.java  |   16 +
 .../com/cloud/bridge/model/MultiPartPartsVO.java   |   16 +
 .../com/cloud/bridge/model/MultiPartUploadsVO.java |   16 +
 .../com/cloud/bridge/model/MultipartMetaVO.java    |   16 +
 .../com/cloud/bridge/model/OfferingBundleVO.java   |   16 +
 .../cloud/bridge/persist/dao/BucketPolicyDao.java  |   16 +
 .../bridge/persist/dao/CloudStackAccountDao.java   |   16 +
 .../persist/dao/CloudStackAccountDaoImpl.java      |   16 +
 .../persist/dao/CloudStackConfigurationDao.java    |   16 +
 .../dao/CloudStackConfigurationDaoImpl.java        |   16 +
 .../persist/dao/CloudStackSvcOfferingDao.java      |   16 +
 .../src/com/cloud/bridge/persist/dao/MHostDao.java |   16 +
 .../cloud/bridge/persist/dao/MHostMountDao.java    |   16 +
 .../bridge/persist/dao/MultiPartPartsDao.java      |   16 +
 .../bridge/persist/dao/MultiPartPartsDaoImpl.java  |   16 +
 .../bridge/persist/dao/MultiPartUploadsDao.java    |   16 +
 .../persist/dao/MultiPartUploadsDaoImpl.java       |   16 +
 .../cloud/bridge/persist/dao/MultipartMetaDao.java |   16 +
 .../bridge/persist/dao/MultipartMetaDaoImpl.java   |   16 +
 .../com/cloud/bridge/persist/dao/OfferingDao.java  |   16 +
 .../src/com/cloud/bridge/persist/dao/SAclDao.java  |   16 +
 .../com/cloud/bridge/persist/dao/SBucketDao.java   |   16 +
 .../src/com/cloud/bridge/persist/dao/SHostDao.java |   16 +
 .../src/com/cloud/bridge/persist/dao/SMetaDao.java |   16 +
 .../com/cloud/bridge/persist/dao/SObjectDao.java   |   16 +
 .../cloud/bridge/persist/dao/SObjectItemDao.java   |   16 +
 .../bridge/persist/dao/UserCredentialsDao.java     |   16 +
 build/build-cloud.xml                              |   14 +-
 build/developer.xml                                |   19 +-
 build/package.xml                                  |   37 +-
 client/cloudstack-ui.launch                        |   18 +
 client/tomcatconf/commands-ext.properties.in       |   22 +-
 client/tomcatconf/netapp_commands.properties.in    |   33 +
 cloud.spec                                         |    2 +-
 console-proxy/.classpath                           |   50 +-
 console-proxy/.project                             |   82 +-
 console-proxy/conf.dom0/agent.properties.in        |   92 +-
 console-proxy/conf.dom0/consoleproxy.properties.in |   46 +-
 console-proxy/conf/agent.properties                |   38 +-
 console-proxy/conf/consoleproxy.properties         |   46 +-
 console-proxy/css/ajaxviewer.css                   |  288 ++--
 console-proxy/js/ajaxviewer.js                     | 1214 +++++++-------
 console-proxy/js/handler.js                        |  106 +-
 console-proxy/scripts/run.bat                      |   36 +-
 .../com/cloud/consoleproxy/AjaxFIFOImageCache.java |   88 +-
 .../consoleproxy/AuthenticationException.java      |   32 +-
 .../consoleproxy/ConsoleProxyAjaxHandler.java      |  752 +++++-----
 .../consoleproxy/ConsoleProxyAjaxImageHandler.java |  246 ++--
 .../ConsoleProxyAuthenticationResult.java          |  130 +-
 .../ConsoleProxyBaseServerFactoryImpl.java         |   50 +-
 .../consoleproxy/ConsoleProxyClientListener.java   |   18 +-
 .../cloud/consoleproxy/ConsoleProxyCmdHandler.java |  106 +-
 .../ConsoleProxyHttpHandlerHelper.java             |  116 +-
 .../consoleproxy/ConsoleProxyLoggerFactory.java    |  140 +-
 .../cloud/consoleproxy/ConsoleProxyMonitor.java    |  226 ++--
 .../consoleproxy/ConsoleProxyResourceHandler.java  |  328 ++--
 .../ConsoleProxySecureServerFactoryImpl.java       |  214 ++--
 .../consoleproxy/ConsoleProxyServerFactory.java    |   14 +-
 .../consoleproxy/ConsoleProxyThumbnailHandler.java |  386 +++---
 .../src/com/cloud/consoleproxy/InputEventType.java |   84 +-
 .../cloud/consoleproxy/util/ITileScanListener.java |   18 +-
 .../com/cloud/consoleproxy/util/ImageHelper.java   |   32 +-
 .../src/com/cloud/consoleproxy/util/Logger.java    |  414 +++---
 .../com/cloud/consoleproxy/util/LoggerFactory.java |   10 +-
 .../src/com/cloud/consoleproxy/util/RawHTTP.java   |  466 +++---
 .../src/com/cloud/consoleproxy/util/Region.java    |  148 +-
 .../cloud/consoleproxy/util/RegionClassifier.java  |   84 +-
 .../src/com/cloud/consoleproxy/util/TileInfo.java  |   78 +-
 .../com/cloud/consoleproxy/util/TileTracker.java   |  506 +++---
 .../consoleproxy/vnc/BufferedImageCanvas.java      |  212 ++--
 .../cloud/consoleproxy/vnc/FrameBufferCanvas.java  |   26 +-
 .../vnc/FrameBufferUpdateListener.java             |   10 +-
 .../vnc/PaintNotificationListener.java             |   10 +-
 .../com/cloud/consoleproxy/vnc/RfbConstants.java   |  117 +-
 .../src/com/cloud/consoleproxy/vnc/VncClient.java  |  747 +++++-----
 .../consoleproxy/vnc/VncClientPacketSender.java    |  380 +++---
 .../consoleproxy/vnc/VncScreenDescription.java     |  129 +-
 .../consoleproxy/vnc/VncServerPacketReceiver.java  |  176 ++--
 .../vnc/packet/client/ClientPacket.java            |    2 +-
 .../client/FramebufferUpdateRequestPacket.java     |   43 +-
 .../vnc/packet/client/KeyboardEventPacket.java     |   30 +-
 .../vnc/packet/client/MouseEventPacket.java        |   32 +-
 .../vnc/packet/client/SetEncodingsPacket.java      |   37 +-
 .../vnc/packet/client/SetPixelFormatPacket.java    |   82 +-
 .../vnc/packet/server/AbstractRect.java            |   62 +-
 .../consoleproxy/vnc/packet/server/CopyRect.java   |   20 +-
 .../server/FrameBufferSizeChangeRequest.java       |   22 +-
 .../vnc/packet/server/FramebufferUpdatePacket.java |  133 +-
 .../consoleproxy/vnc/packet/server/RawRect.java    |   67 +-
 .../cloud/consoleproxy/vnc/packet/server/Rect.java |   15 +-
 .../vnc/packet/server/ServerCutText.java           |   32 +-
 console-proxy/ui/viewer-update.ftl                 |   48 +-
 .../resource/NfsSecondaryStorageResource.java      |   14 +-
 debian/cloud-deps.install                          |    5 +-
 debian/control                                     |   10 +-
 deps/.classpath                                    |    1 -
 .../debian/config/etc/init.d/cloud-early-config    |   30 +
 .../debian/config/opt/cloud/bin/passwd_server      |    3 +-
 .../debian/config/opt/cloud/bin/vpc_acl.sh         |   11 +-
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh     |   18 +-
 .../hypervisor/vmware/resource/VmwareResource.java |   11 +-
 scripts/storage/secondary/cloud-install-sys-tmplt  |    5 +-
 scripts/vm/hypervisor/xenserver/vmops              |   53 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |    1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    2 +-
 tools/build/build_asf.sh                           |   22 +-
 tools/whisker/descriptor.xml                       |   25 +-
 wscript                                            |  114 +--
 wscript_build                                      |    3 +-
 wscript_configure                                  |    1 +
 119 files changed, 5527 insertions(+), 5649 deletions(-)
----------------------------------------------------------------------



Mime
View raw message