summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-09-25Merge "Delete unexistant objects."Ruan HE1-5/+1
2015-09-25Delete unexistant objects.asteroide1-5/+1
Change-Id: Ib4fd2554e602df5d4170760972fd37516b524e04
2015-09-25Fix a bug in aggregation_algorithm functions.asteroide1-2/+2
Change-Id: Id480972ce81173c720e5e2461ad5fd472aecc90e
2015-09-24Update Keystone code from repository.asteroide184-1914/+17646
Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00
2015-09-24Merge "Update code from KeystoneMiddleware Github repository (Master)."Ruan HE46-1694/+2656
2015-09-24Update code from KeystoneMiddleware Github repository (Master).asteroide46-1694/+2656
Change-Id: Id28c5bf48b3dbb6c8a08e66411b5785029f6857d
2015-09-24Merge "Delete tests for intra_extensions because they are in tests_tenants.json"Ruan HE1-43/+0
2015-09-24Merge "Create user in Keystone database when needed."Ruan HE3-12/+71
2015-09-24Delete tests for intra_extensions because they are in tests_tenants.jsonasteroide1-43/+0
Change-Id: I1aa888142ccf87654b9701986a02d63b57d9d93f
2015-09-24Create user in Keystone database when needed.asteroide3-12/+71
Change-Id: Ie898bd663e572785bd98b4d9143caa6a9bc5cead
2015-09-24Delete unneeded egg information.asteroide6-74/+0
Change-Id: I8decd141ac29de5b3aea56b49ccf94dbb84c04ba
2015-09-23Automatically create tenant in Keystone if tenant name doesn't exist in ↵asteroide1-2/+28
Keystone. Change-Id: I773c2508092b3aeb921a9f7a4133331ca04c1858
2015-09-23finish moonclient-review2, only problem about intra-extensionWuKong7-87/+39
Change-Id: I2867ca2ce1498dd06cbdd0d6b672a5cb2e920f37 Signed-off-by: WuKong <rebirthmonkey@gmail.com>
2015-09-23review moonclientWuKong20-379/+402
Change-Id: I0969fe42fd756c025d549d0cffe07943cddd2d15 Signed-off-by: WuKong <rebirthmonkey@gmail.com>
2015-09-22Merge "Remove some unneeded logs."Ruan HE1-3/+0
2015-09-22Remove some unneeded logs.asteroide1-3/+0
Change-Id: I9a39b183f2613081eafef28bc8e385b7c2fbb628
2015-09-22Fix all rule commands.asteroide3-44/+554
Change-Id: Ib0f30f2a9e26b4a9ac22af94c2b526a4e4f79e2e
2015-09-22moonclient documentationWuKong4-72/+27
Change-Id: I82a8f4fc4a66fbe2b751b7a0653616256ed689ed Signed-off-by: WuKong <rebirthmonkey@gmail.com>
2015-09-22Merge "Remove unneeded files in tree."Ruan HE2-66/+0
2015-09-22Merge "Change the regular expression used to catch ''"Ruan HE1-1/+1
2015-09-22Remove unneeded files in tree.asteroide2-66/+0
Change-Id: I55fd30cf60d8854f84b37b65bbe135690df545fb
2015-09-22Merge "Delete all references to the AggregationAlgorithms SQL table."Ruan HE3-30/+14
2015-09-22Change the regular expression used to catch ''asteroide1-1/+1
Change-Id: I62a6f21b0a22fac0c82799a77b8cab202242b5c0
2015-09-22Delete all references to the AggregationAlgorithms SQL table.asteroide3-30/+14
Change-Id: Ia508870842d17e6b8e2d8f34bd362cf3377f1594
2015-09-22Fix all SubMetaRule commands.asteroide3-67/+386
Change-Id: I9aa775be6843e11e321e9deca254204618719fcd
2015-09-21Merge topic 'moon-abe-stable'Ruan HE38-22/+519
* changes: abe stable abe stable
2015-09-21abe stableWuKong11-0/+497
Change-Id: I24636de149d71b3c9fcdec7587c5f71ade23fe4b Signed-off-by: WuKong <rebirthmonkey@gmail.com>
2015-09-21abe stableWuKong27-22/+22
Change-Id: I52379627346ce52264042110c133f544284a8f00 Signed-off-by: WuKong <rebirthmonkey@gmail.com>
2015-09-21Put the ID of aggregation algorithm for a particular IntraExtension in the ↵asteroide10-123/+118
intraextensions table and generate a static UUID for each aggregation algorithms in the memory backend. Change-Id: Ic56dc05ca3d7e099e1d529c5bb88b5d93de88ae1
2015-09-18Fix the configuration commands and add the tests for them.asteroide2-6/+230
Change-Id: I47beb7dd0854e749fece1cd10a4591d8e9115dcc
2015-09-18Merge "Add action assignments commands and the tests for them."Ruan HE2-15/+402
2015-09-18Add action assignments commands and the tests for them.asteroide2-15/+402
Change-Id: I5d6f41179a68e77b2a0fd3bc052da1a4a65103e0
2015-09-18Add object assignments commands and the tests for them.asteroide2-17/+404
Change-Id: Icec67fd57fec3468b5a0c63e98d85aa2ae6d5da1
2015-09-18Merge "Add subject assignments commands and the tests for them."Ruan HE2-14/+401
2015-09-18Merge "Change the way the data strings are replaced to allow similar ↵Ruan HE1-1/+1
variables on the same line."
2015-09-18Add subject assignments commands and the tests for them.asteroide2-14/+401
Change-Id: I11312fa5413b02b505b853785bf7fbd4d27a806a
2015-09-18Change the way the data strings are replaced to allow similar variables on ↵asteroide1-1/+1
the same line. Change-Id: I0ba5f0151ebc144015196b758c1bde587da63e7b
2015-09-18Fix a bug when adding an assignment.asteroide1-1/+1
Change-Id: Ic3055c39ce0202808c8f7ca0d1d4dfac71145af0
2015-09-18Merge "Fix a bug in subjects tests."Ruan HE1-0/+28
2015-09-18Fix a bug in subjects tests.asteroide1-0/+28
Change-Id: I0919a806437682aaa45df8bf48b06ac36fc5d9ac
2015-09-17Add all commands for scopes and add tests for them.asteroide8-92/+880
Change-Id: Id6fd4755158e52aa35569579aa6d60e4a0b2b535
2015-09-17Merge "Fix some bugs in subjects tests and add objects and actions tests"Ruan HE3-2/+474
2015-09-17Merge "Fix subject, object and action categories commands and add tests for ↵Ruan HE6-27/+747
them."
2015-09-17Fix subject, object and action categories commands and add tests for them.asteroide6-27/+747
Change-Id: I36dac141516da4a21c71cd7dadbb468fde255df7
2015-09-17Fix some bugs in subjects tests and add objects and actions testsasteroide3-2/+474
Change-Id: Ie9c1954f7989385dee3fc909a65ee36ccc893626
2015-09-17In controllers, user_id is the Keystone ID and that don't match with the id ↵asteroide2-30/+18
in the core.enforce. Change-Id: Ib7dc8452b16da3f82ff48b74bd29cf04f3390834
2015-09-17Add a select command to IntraExtension.asteroide3-59/+49
Change-Id: Ia78a10b51a17e9376e125130973f3813cc423f94
2015-09-16Merge "Add more checks when setting tenant."Ruan HE1-5/+19
2015-09-16Add more checks when setting tenant.asteroide1-5/+19
Change-Id: I76d812d94c2c2a9c48ee26395f45a3f130883201
2015-09-16Add a better output to tests command.asteroide1-2/+4
Change-Id: If581feabafc9c36e5923a3c3939e4d5a61b64619