diff options
author | Kim van der Riet <kpvdr@apache.org> | 2013-10-22 13:16:43 +0000 |
---|---|---|
committer | Kim van der Riet <kpvdr@apache.org> | 2013-10-22 13:16:43 +0000 |
commit | 220f7ec525b29efd94113f2d3be511c5156c3b3a (patch) | |
tree | 4a6b950101c98bd84ae28f341652522a940bca94 /qpid/cpp/src/qpid/acl/AclValidator.cpp | |
parent | 7348c75f13673a6a0434bfddc8dff474ba6b69c2 (diff) | |
download | qpid-python-220f7ec525b29efd94113f2d3be511c5156c3b3a.tar.gz |
QPID-4984: WIP - Merge from trunk r.1534626.linearstore
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1534627 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/acl/AclValidator.cpp')
-rw-r--r-- | qpid/cpp/src/qpid/acl/AclValidator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/acl/AclValidator.cpp b/qpid/cpp/src/qpid/acl/AclValidator.cpp index 73b49b2959..a077667a33 100644 --- a/qpid/cpp/src/qpid/acl/AclValidator.cpp +++ b/qpid/cpp/src/qpid/acl/AclValidator.cpp @@ -110,7 +110,7 @@ namespace acl { boost::shared_ptr<PropertyType>( new IntPropertyType(0,std::numeric_limits<int64_t>::max())))); - std::string policyTypes[] = {"ring", "ring_strict", "flow_to_disk", "reject"}; + std::string policyTypes[] = {"ring", "self-destruct", "reject"}; std::vector<std::string> v(policyTypes, policyTypes + sizeof(policyTypes) / sizeof(std::string)); validators.insert(Validator(acl::SPECPROP_POLICYTYPE, boost::shared_ptr<PropertyType>( |