Merge from stable.

This commit is contained in:
Dannon Baker
2015-02-12 13:40:22 -05:00
2 changed files with 10 additions and 10 deletions
+9 -9
View File
@@ -8,18 +8,18 @@ a4113cc1cb5eaa68091c9a73375f00555b66dd11 release_2013.01.13
5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10
9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14
7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02
9bce3f426863f8ba88062f67c7efc1836e82ee7c latest_2014.06.02
8f9dcac033694e4cabcf5daae5cca1cfefbe967f latest_2014.04.14
c52dc4c72b77e4b0849a596b6d05e4341236642a latest_2014.06.02
b2c0570f52e18d8661ca1d80c42867e4b036f22b latest_2014.04.14
9c323aad4ffdd65a3deb06a4a36f6b2c5115a60f latest_2013.01.13
b986c184be88947b5d1d90be7f36cfd2627dd938 latest_2013.02.08
dec9431d66b837a208e2f060d90afd913c721227 latest_2013.04.01
19e56e66b0b344c6e2afa4541f6988e4fdb9af29 latest_2013.06.03
cee903b8b3eee9145627ee89742555dac581791e latest_2013.08.12
7d5aa19a166cba9039e15f338a1e3fc924c43d3a latest_2013.11.04
0c000cc2f9c05bf4c1c2bc3a10215014fd64e696 latest_2014.02.10
aae74ee09e4667e270750711327c8167e1dfae05 latest_2013.06.03
db967a25c5db969ee4b3e138fe2be4d979665bdf latest_2013.08.12
52a18b44474f017fce92850fb3892a4f76a7374a latest_2013.11.04
746db2bf4da081a7491b5a4602aeadd2611b3b1d latest_2014.02.10
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
f3fc4602e22b39468d780b955a1a05caf867a7e9 latest_2014.08.11
6d6d7f8b321725a21a96ce21e7d18a3a66f7b72e latest_2014.08.11
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
9bd6f8b5b8153db752f4e61ed62f2b6c01ae4a11 latest_2014.10.06
782fa60fc65488aea0c618d723e9a63d42caf865 latest_2014.10.06
2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
4039bfd5584aac053f686197a76ac176253e6f3d latest_2015.01.13
577b270034b48d90e58ffbea296e700d229545c9 latest_2015.01.13
+1 -1
View File
@@ -2863,7 +2863,7 @@ class DataManagerTool( OutputParameterJSONTool ):
return True
if user:
user = user.id
log.debug( "User (%s) attempted to access a data manager tool (%s), but is not an admin.", user, self.id )
log.debug( "User (%s) attempted to access a data manager tool (%s), but is not an admin.", user, self.id )
return False
# Populate tool_type to ToolClass mappings