Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openstack/swift/swift.p5m
changeset 3998 5bd484384122
parent 3732 0f62cc221c7e
child 4392 bc0af00a3a4a 
--- a/components/openstack/swift/swift.p5m	Fri Mar 20 03:13:26 2015 -0700
+++ b/components/openstack/swift/swift.p5m	Thu Mar 19 14:41:20 2015 -0700
@@ -28,14 +28,14 @@
 <transform file path=.*/(.*_attr)\.d -> set action.hash files/swift.%<1>>
 <transform file path=.*/(.*_attr)\.d -> default group sys>
 <transform file path=etc/swift/(.*) -> set action.hash etc/%<1>-sample>
+<transform file path=etc/swift/proxy-server.conf -> set action.hash files/proxy-server.conf>
 <transform file path=etc/swift/rsyncd.conf -> set action.hash files/rsyncd.conf>
-<transform file path=etc/swift/proxy-server.conf -> set action.hash files/proxy-server.conf>
 <transform dir file path=etc/swift/? -> default owner swift>
 <transform dir file path=etc/swift/? -> default group swift>
 <transform file path=etc/swift/ -> default mode 0644>
 <transform file path=etc/swift/ -> default overlay allow>
 <transform file path=etc/swift/ -> default preserve renamenew>
-<transform file path=lib/svc/.*/([^/]*) -> set action.hash files/%<1>>
+<transform file path=lib/svc/method/([^/]*) -> set action.hash files/%<1>>
 <transform hardlink path=lib/svc/method -> default target swift-proxy-server>
 <transform file path=lib/svc/method/swift-proxy-server -> set action.hash files/swift-smf-method>
 <transform file path=usr/lib/swift/(.*) -> set action.hash usr/bin/%<1>>
@@ -47,7 +47,6 @@
 set name=pkg.summary value="OpenStack Swift (Object Storage Service)"
 set name=pkg.description \
     value="The OpenStack Object Store project, known as Swift, offers cloud storage software so that you can store and retrieve data in virtual containers"
-set name=pkg.human-version value="Havana 2013.2.3"
 set name=com.oracle.info.description \
     value="Swift, the OpenStack object storage service"
 set name=com.oracle.info.tpno value=$(TPNO)
@@ -59,14 +58,18 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/050
+set name=openstack.upgrade-id reboot-needed=true value=$(COMPONENT_BE_VERSION)
+set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/050 \
+    value=PSARC/2015/110
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=etc/security/auth_attr.d/cloud:openstack:swift
 file path=etc/security/exec_attr.d/cloud:openstack:swift
 file path=etc/security/prof_attr.d/cloud:openstack:swift
 dir  path=etc/swift mode=0700
 file path=etc/swift/account-server.conf
+file path=etc/swift/container-reconciler.conf
 file path=etc/swift/container-server.conf
+file path=etc/swift/container-sync-realms.conf
 file path=etc/swift/dispersion.conf
 file path=etc/swift/memcache.conf
 file path=etc/swift/mime.types
@@ -74,13 +77,14 @@
 file path=etc/swift/object-server.conf
 file path=etc/swift/proxy-server.conf
 file path=etc/swift/rsyncd.conf
-file path=etc/swift/swift-bench.conf
 file path=etc/swift/swift.conf
+file path=etc/user_attr.d/cloud:openstack:swift
 file path=lib/svc/manifest/application/openstack/swift-account-auditor.xml
 file path=lib/svc/manifest/application/openstack/swift-account-reaper.xml
 file path=lib/svc/manifest/application/openstack/swift-account-replicator.xml
 file path=lib/svc/manifest/application/openstack/swift-account-server.xml
 file path=lib/svc/manifest/application/openstack/swift-container-auditor.xml
+file path=lib/svc/manifest/application/openstack/swift-container-reconciler.xml
 file path=lib/svc/manifest/application/openstack/swift-container-replicator.xml
 file path=lib/svc/manifest/application/openstack/swift-container-server.xml
 file path=lib/svc/manifest/application/openstack/swift-container-sync.xml
@@ -92,11 +96,13 @@
 file path=lib/svc/manifest/application/openstack/swift-object-updater.xml
 file path=lib/svc/manifest/application/openstack/swift-proxy-server.xml
 file path=lib/svc/manifest/application/openstack/swift-replicator-rsync.xml
+file path=lib/svc/manifest/application/openstack/swift-upgrade.xml
 hardlink path=lib/svc/method/swift-account-auditor
 hardlink path=lib/svc/method/swift-account-reaper
 hardlink path=lib/svc/method/swift-account-replicator
 hardlink path=lib/svc/method/swift-account-server
 hardlink path=lib/svc/method/swift-container-auditor
+hardlink path=lib/svc/method/swift-container-reconciler
 hardlink path=lib/svc/method/swift-container-replicator
 hardlink path=lib/svc/method/swift-container-server
 hardlink path=lib/svc/method/swift-container-sync
@@ -108,16 +114,18 @@
 hardlink path=lib/svc/method/swift-object-updater
 file path=lib/svc/method/swift-proxy-server
 file path=lib/svc/method/swift-replicator-rsync
+file path=lib/svc/method/swift-upgrade
 file path=usr/bin/swift-account-audit
-file path=usr/bin/swift-bench
-file path=usr/bin/swift-bench-client
+file path=usr/bin/swift-account-info
 file path=usr/bin/swift-config
+file path=usr/bin/swift-container-info
 file path=usr/bin/swift-dispersion-populate
 file path=usr/bin/swift-dispersion-report
 file path=usr/bin/swift-form-signature
 file path=usr/bin/swift-get-nodes
 file path=usr/bin/swift-object-info
 file path=usr/bin/swift-recon
+file path=usr/bin/swift-reconciler-enqueue
 file path=usr/bin/swift-ring-builder
 file path=usr/bin/swift-temp-url
 file path=usr/lib/python$(PYVER)/vendor-packages/swift-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
@@ -125,6 +133,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/swift-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/swift-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/swift-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/swift-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/swift-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/swift-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/__init__.py
@@ -135,10 +144,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/account/replicator.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/account/server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/account/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/cli/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/cli/form_signature.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/cli/info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/cli/recon.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/cli/ringbuilder.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/bench.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/base_storage_server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/bufferedhttp.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/constraints.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/container_sync_realms.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/daemon.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/db.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/db_replicator.py
@@ -155,9 +170,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/catch_errors.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/cname_lookup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/container_quotas.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/container_sync.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/crossdomain.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/dlo.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/domain_remap.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/formpost.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/gatekeeper.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/healthcheck.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/keystoneauth.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/list_endpoints.py
@@ -170,17 +188,25 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/staticweb.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/tempauth.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/tempurl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/x_profile/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/x_profile/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/x_profile/html_viewer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/x_profile/profile_model.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/middleware/xprofile.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/request_helpers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/ring/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/ring/builder.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/ring/ring.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/ring/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/splice.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/storage_policy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/swob.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/common/wsgi.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/container/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/container/auditor.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/container/backend.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/container/reconciler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/container/replicator.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/container/server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/container/sync.py
@@ -189,14 +215,19 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/auditor.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/diskfile.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/expirer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/mem_diskfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/mem_server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/replicator.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/ssync_receiver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/ssync_sender.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/updater.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/account.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/container.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/info.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/obj.py
 file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/server.py
 file path=usr/lib/swift/swift-account-auditor
@@ -204,6 +235,7 @@
 file path=usr/lib/swift/swift-account-replicator
 file path=usr/lib/swift/swift-account-server
 file path=usr/lib/swift/swift-container-auditor
+file path=usr/lib/swift/swift-container-reconciler
 file path=usr/lib/swift/swift-container-replicator
 file path=usr/lib/swift/swift-container-server
 file path=usr/lib/swift/swift-container-sync
@@ -217,10 +249,12 @@
 file path=usr/lib/swift/swift-proxy-server
 file path=usr/lib/swift/swift-recon-cron
 file path=usr/share/man/man1/swift-account-auditor.1
+file path=usr/share/man/man1/swift-account-info.1
 file path=usr/share/man/man1/swift-account-reaper.1
 file path=usr/share/man/man1/swift-account-replicator.1
 file path=usr/share/man/man1/swift-account-server.1
 file path=usr/share/man/man1/swift-container-auditor.1
+file path=usr/share/man/man1/swift-container-info.1
 file path=usr/share/man/man1/swift-container-replicator.1
 file path=usr/share/man/man1/swift-container-server.1
 file path=usr/share/man/man1/swift-container-sync.1
@@ -255,20 +289,20 @@
 license LICENSE license="Apache v2.0"
 
 # force a dependency on dnspython; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/dnspython-26
+depend type=require fmri=library/python/dnspython-$(PYV)
 
-# force a dependency on keystoneclient; used via a paste.deploy filter
-depend type=require fmri=library/python/keystoneclient-26
+# force a dependency on keystonemiddleware; used via a paste.deploy filter
+depend type=require fmri=library/python/keystonemiddleware-$(PYV)
 
 # force a dependency on netifaces; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/netifaces-26
+depend type=require fmri=library/python/netifaces-$(PYV)
 
 # force a dependency on paste.deploy; pkgdepend work is needed to flush this
 # out.
-depend type=require fmri=library/python/paste.deploy-26
+depend type=require fmri=library/python/paste.deploy-$(PYV)
 
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pbr-26
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
 
 # force a dependency on xattr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/xattr-26
+depend type=require fmri=library/python/xattr-$(PYV)
upstream/oracle/userland-gate