Commit graph

942 commits

Author SHA1 Message Date
Benjamin Phillippe
84921616bb Issue #1948 Implemented Pulling notifications on demand
Change-Id: I1d6debf2e67631708ec8471f50fd2c36b938abaf

Former-commit-id: f0c56cc09d [formerly 9962173468] [formerly bb7e91d673 [formerly 4696a86bd969bebbcc48363bd14fdf6c2234b836]]
Former-commit-id: bb7e91d673
Former-commit-id: 8fe6f260ca
2013-04-30 20:12:05 -05:00
Dustin Johnson
15658cb411 Issue #1910 EventBus register/unregister fixes and test memory management
Change-Id: I840b2ff12db8f24d3f5e186dff4e8a513a86f48e

Former-commit-id: 85ca4f57ec [formerly 5101c1585d] [formerly f8bba72501 [formerly eaf92d9fedd4a429bab3b19b9e61e044dde103eb]]
Former-commit-id: f8bba72501
Former-commit-id: e51bd3ddcd
2013-04-29 10:35:42 -05:00
Dustin Johnson
fdcce4ec96 Issue #1910 Fix NPE when statusHandler not in debug
Change-Id: I5bb9c213491e485e3985bd7f4d5035aa2945869b

Former-commit-id: cd1733fd7f [formerly da7a648a61] [formerly f1d4b5d329 [formerly 18bc074721877b26f04bd3a2d0f784b8e208c25e]]
Former-commit-id: f1d4b5d329
Former-commit-id: 0184f41374
2013-04-26 13:56:38 -05:00
Dustin Johnson
cd7ae19f49 Merge "Issue #1910 Add initial validator framework supporting checkReferences" into development
Former-commit-id: 327c6f23d0 [formerly 2f7ab5b080] [formerly af9cc8e793 [formerly 09d03447f75e89260eba9304a8e37fc828a086b7]]
Former-commit-id: af9cc8e793
Former-commit-id: d5418470a5
2013-04-26 11:12:19 -05:00
Max Schenkelberg
edd5c507bb Issue #1638 Refactored topo resource to load different topo files. Added GMT TimeZone to TimeUtil.
Change-Id: I4d94a9a2a6dc7ad1261e2ed52c97bab67256b4c8

Former-commit-id: 473b90d885 [formerly b141397516] [formerly 532211dc69 [formerly 06107e34a04a2ef0df707a7643daad9e1ec11a0b]]
Former-commit-id: 532211dc69
Former-commit-id: 88211a0f5c
2013-04-24 18:11:30 -05:00
Dustin Johnson
af4e80ed03 Issue #1910 Add initial validator framework supporting checkReferences
Change-Id: I11aeacf7859d5c755111cc5169ccaedae595146c

Former-commit-id: d41698aa81 [formerly aa85728ffa] [formerly 93f97aa45e [formerly c6ec100fda197235fd82fc50432491b78344bab2]]
Former-commit-id: 93f97aa45e
Former-commit-id: a8c44998b5
2013-04-24 17:01:00 -05:00
Benjamin Phillippe
6edfda46bf Issue #1931 Implemented REST binding for registry
Change-Id: I604c02dc849e380f70e2d27fa1f2b30dadcf0776

Former-commit-id: 9a7971c872 [formerly 9065ebcb65] [formerly 3d2e073dd7 [formerly daef43d8947f690d15f9314f85b8cf31d30c06ab]]
Former-commit-id: 3d2e073dd7
Former-commit-id: cf7da4b001
2013-04-22 13:17:53 -05:00
Dustin Johnson
ef0c554826 Issue #1910 Changes to comply with the Ebxml 4.0 spec for SubmitObjects
Amend: Rebase on newest development commits

Change-Id: I70fcf39d4c819e961921496c9a8f9097981b1de7

Former-commit-id: 42b2e12061 [formerly 457710f5d4] [formerly 3adc0f3bd9 [formerly 78bfd27bf513a4014c957a069432e8a05d519004]]
Former-commit-id: 3adc0f3bd9
Former-commit-id: 6b1bd85a9b
2013-04-22 11:25:08 -05:00
Max Schenkelberg
69abb31ee6 Issue #1638 Made string rendering always look right despite extent proportions so it is never warped. Moved dataURI map creation to DataURIUtil. Fixed double dispose of controls in VizDisplayPane, also made resize non interface method.
Amend: Fixed menu mix up and making sure perspective bar is on by default

Change-Id: I0c19e5fbf0f0d29cdca0f63afb33ca964a145b94

Former-commit-id: c8fcaf06d1 [formerly b91b706701] [formerly 1d3c378dde [formerly 53e42aa3925399271cc3ad4ee964476ddffc8eb6]]
Former-commit-id: 1d3c378dde
Former-commit-id: e05c12e246
2013-04-19 14:57:40 -05:00
Dustin Johnson
6ded48bcd8 Issue #1914 Add email notification as a notification listener
Amend: Fix broken test

Change-Id: I3b692255b5d84fffce174c0447970fe627f4a61e

Former-commit-id: f3d53eb889 [formerly 74a9b93d05] [formerly 067b20c684 [formerly 45b5a9cffd6c57dc8ea1355ee623fcf6014dd377]]
Former-commit-id: 067b20c684
Former-commit-id: 7b09a0e477
2013-04-18 12:57:38 -05:00
Dustin Johnson
912cc39887 Merge "Issue #1914 Add plugin based registry notification" into development
Former-commit-id: af04ecf92b [formerly 1edba0cdc6] [formerly 67eb771ccb [formerly 0b7539d488388f4f96af0ccf97f5651c8e7d8259]]
Former-commit-id: 67eb771ccb
Former-commit-id: 375221e524
2013-04-18 11:00:57 -05:00
Benjamin Phillippe
f38475de7d Issue #1905 Implemented registry notifications via email
Change-Id: I2753074c302d707066ac0de42ac5b0778049275d

Former-commit-id: a44a4b69ff [formerly a525a1430c] [formerly 7e6b8eedca [formerly e8dba1178491176da3543a46c0d543c489b5fcb1]]
Former-commit-id: 7e6b8eedca
Former-commit-id: 9742cc996f
2013-04-18 10:19:12 -05:00
Dustin Johnson
1ea04e20e0 Issue #1914 Add plugin based registry notification
Change-Id: Ie450b60683e4c317ac19628cb923310b828747a7

Former-commit-id: dd190be390 [formerly 91fe9ea501] [formerly 8989c09566 [formerly c75a5f6664b3c6d79773f4eda52ce03dfb5ba877]]
Former-commit-id: 8989c09566
Former-commit-id: 0e1994a03c
2013-04-17 12:17:23 -05:00
Dustin Johnson
ce9f5a7365 Issue #1910 Add some tests of the LifecycleManager SubmitObjects functionality
Change-Id: Ieb1544cb52cf108836b157e3d800c470fa5cf3e1

Former-commit-id: 67e49201d6 [formerly 255aea053b] [formerly 58b6899672 [formerly c4344f5402fe33e7e47515adc3b54913f9c13617]]
Former-commit-id: 58b6899672
Former-commit-id: cb899b3fa0
2013-04-16 11:30:06 -05:00
Dustin Johnson
ee0572026a Issue #1906 Remove new registry plugin from datadelivery feature
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598

Former-commit-id: e44d3a8715 [formerly c8241840c5] [formerly 977702e876 [formerly 71b4bb07870f5490d89a1fe657429444c54a2689]]
Former-commit-id: 977702e876
Former-commit-id: 8170693941
2013-04-16 10:36:56 -05:00
Dustin Johnson
395e4db621 Issue #1906 Remove use of hibernate columnDefinition from SubscriptionType
Change-Id: I310914180865ca65290c48dc1c55f9dc11f3c044

Former-commit-id: 3e5ace2cf3 [formerly 391a7bb999] [formerly 8b38dec4bb [formerly 67ff37feac0998378a30c09894fab7ea0dbd84f8]]
Former-commit-id: 8b38dec4bb
Former-commit-id: 80ff75c473
2013-04-16 08:08:47 -05:00
Nate Jensen
d785d3f1c2 Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development
Former-commit-id: 56c1fe7422 [formerly 0cbf561f7c] [formerly d411aad285 [formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]
Former-commit-id: d411aad285
Former-commit-id: 9d0e3fd0c2
2013-04-15 14:57:03 -05:00
Matt Nash
317cbf0950 Issue #1870 add package-info.java so that the empty src directory gets pushed to git
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840

Former-commit-id: 7ffb45758d [formerly 0d12fb16bc] [formerly 4b896002ac [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]
Former-commit-id: 4b896002ac
Former-commit-id: 87af6d2809
2013-04-15 14:53:07 -05:00
Benjamin Phillippe
e5fbf006dd Issue #1802 Implemented ebxml registry replication
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531

Former-commit-id: e3f3483b51 [formerly 120906de78] [formerly ec69cdeb44 [formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]
Former-commit-id: ec69cdeb44
Former-commit-id: c0099a8a39
2013-04-12 11:27:45 -05:00
Matt Nash
4ee6085bda Issue #1871 convert parameters to Strings and make sure to return them
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

Former-commit-id: 64323fc0af [formerly cd77308fac] [formerly 6c488cee05 [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]
Former-commit-id: 6c488cee05
Former-commit-id: 7dd72ab7d5
2013-04-12 09:31:23 -05:00
Matt Nash
e6fc7942b8 Issue #1871 add default values for times so they don't need to be sent in from
Python, move getLatLonCoords()

Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1

Former-commit-id: 2ab1cf8abb [formerly 3af61d7117] [formerly b44ee44664 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]
Former-commit-id: b44ee44664
Former-commit-id: c95e825d35
2013-04-12 09:31:16 -05:00
Matt Nash
705be14b64 Issue #1871 make Java data access class better match Python version
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051

Former-commit-id: baafdafed7 [formerly 68c84fd8cc] [formerly 4ac6480f52 [formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]
Former-commit-id: 4ac6480f52
Former-commit-id: 7ffd8efcf2
2013-04-12 09:31:07 -05:00
Nate Jensen
12d4837e78 Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
Former-commit-id: 03fac8cb06 [formerly 36ad161721] [formerly 8561b201d5 [formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]
Former-commit-id: 8561b201d5
Former-commit-id: 826e64a990
2013-04-12 09:30:38 -05:00
Matt Nash
123351e82b Issue #1870 implement PathManager interface in Python to allow Python code to
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 68892951c5 [formerly bf01f50e17] [formerly 4b23ec7c0a [formerly e3df8efa51ad95c952318b59edca702157a59856]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: caf1f1fdf7
2013-04-12 07:55:56 -05:00
Max Schenkelberg
e369546b51 Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
Amend: Create copy on write for PluginFactory

Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f

Former-commit-id: 1bec335fd7 [formerly 6e70b21f5f] [formerly b695de3698 [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]
Former-commit-id: b695de3698
Former-commit-id: f2a0f8223a
2013-04-10 10:04:17 -05:00
Dustin Johnson
0578916ec1 Issue #1826 Remove delivery/notify options for subscriptions
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: f3526508f3 [formerly 11fd2d676b] [formerly 6bc69df127 [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]
Former-commit-id: 6bc69df127
Former-commit-id: b78f56f1ca
2013-04-09 11:40:25 -05:00
Dustin Johnson
4b4eb8e406 Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.

Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf

Former-commit-id: cef805e79a [formerly 61346b1388] [formerly f3bdede2c8 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]
Former-commit-id: f3bdede2c8
Former-commit-id: 8c52cd190f
2013-04-05 12:41:02 -05:00
Steve Harris
0f53c46d7a Merge branch 'omaha_13.3.1' into development
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: ed8c0487fe
2013-04-04 11:58:50 -05:00
Steve Harris
0342b648b6 Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 2bc12f7a23 [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]
Former-commit-id: 327d05f3b5
Former-commit-id: c7b9690456
2013-04-03 15:52:19 -05:00
Richard Peter
8ac6ae3539 Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
Former-commit-id: 920ba0628c [formerly d282a49b6f] [formerly 6d73e25290 [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]
Former-commit-id: 6d73e25290
Former-commit-id: 64dc5c4d23
2013-04-03 15:14:17 -05:00
Richard Peter
d973d83519 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
Former-commit-id: dd527a4ef2 [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]
Former-commit-id: cfcacd20e9
Former-commit-id: 58908a0fd7
2013-04-03 15:13:26 -05:00
Steve Harris
0edd049e3b 13.3.1-18 baseline
Former-commit-id: f3e79bcc9d [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: ce6a06a7e3
Former-commit-id: bf6c3b6762
2013-04-03 14:58:29 -05:00
Bryan Kowal
b60bea920c Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: d1663ea98b [formerly e788c7b471] [formerly ee8c99ef6e [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]
Former-commit-id: ee8c99ef6e
Former-commit-id: 344237d9ee
2013-04-03 14:03:54 -05:00
Bryan Kowal
93cd16508c Issue #1661 - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: ad523b9cee [formerly 939ff752e8] [formerly 42ab5f4244 [formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]
Former-commit-id: 42ab5f4244
Former-commit-id: 4fe7bace99
2013-04-03 14:03:18 -05:00
Ron Anderson
0d57a752dc Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: 34c8aad559 [formerly 3a3cdcbf46] [formerly b703b4779e [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]
Former-commit-id: b703b4779e
Former-commit-id: 065ba61389
2013-04-03 14:01:18 -05:00
Roger Ferrel
2b4b10d643 Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: f8d1a13c38 [formerly 54cbf656e9] [formerly d2aae617b2 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]
Former-commit-id: d2aae617b2
Former-commit-id: 7b829a2fec
2013-04-03 12:48:18 -05:00
Greg Armendariz
e3cf306ce4 Issue #1782 - Restoring #1813 & #1478
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: f1776b887d [formerly e5408c3807] [formerly 54f56fde29 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]
Former-commit-id: 54f56fde29
Former-commit-id: 02e79dfe8a
2013-04-02 15:00:26 -05:00
Nate Jensen
1ad5bb1a52 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: ab28523a09 [formerly f57358cff8] [formerly 8f9ec8dd2c [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 374eed35b3
2013-04-02 14:29:15 -05:00
Dustin Johnson
644ed2396d Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
Amend:
   Use TimeUtil.newGmtCalendar() and remove whitespace only change
   Add TODO for point data types.

Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3

Former-commit-id: 48a2002e68 [formerly c981b7250f] [formerly 6129d86be4 [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]
Former-commit-id: 6129d86be4
Former-commit-id: dd8f4d8454
2013-04-01 15:35:51 -05:00
Max Schenkelberg
ba262e2bc5 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: 9d032f3e84 [formerly b32fbad9c8] [formerly 547190329b [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]
Former-commit-id: 547190329b
Former-commit-id: 635388a7ad
2013-04-01 12:41:50 -05:00
Steve Harris
7b27767d7e Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java

Former-commit-id: 736bb45741 [formerly 140765a43e] [formerly 437a04011a [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 437a04011a
Former-commit-id: 0b48e96314
2013-04-01 12:19:04 -05:00
Steve Harris
f85a1ab9ab Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Former-commit-id: 3b722f1076 [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]
Former-commit-id: 14c9de2259
Former-commit-id: a6dd28cc82
2013-04-01 12:15:04 -05:00
Steve Harris
ef413da5f7 13.3.1-17 baseline
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
2013-04-01 12:04:56 -05:00
Steve Harris
2bf790aae3 13.3.1-15 baseline
Former-commit-id: 4cf3ad6abb [formerly eb1dab3864] [formerly 3d8ed484be [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: 3d8ed484be
Former-commit-id: d3cec5d3cb
2013-04-01 11:33:20 -05:00
Max Schenkelberg
8de3a70962 Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments

Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835

Former-commit-id: a508e9c8cb [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]
Former-commit-id: 51d976e5e2
Former-commit-id: 1c35a54a9f
2013-04-01 10:19:36 -05:00
Ron Anderson
d5e3976dc4 Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: cfb324f380 [formerly aeb451a37c] [formerly 679bb01764 [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]
Former-commit-id: 679bb01764
Former-commit-id: 96e8f63679
2013-03-29 10:07:37 -05:00
Greg Armendariz
dcd36e64a6 Fix merge issue
Former-commit-id: 611661ccc9 [formerly cd5da3a6c5] [formerly 5da06cadd7 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]
Former-commit-id: 5da06cadd7
Former-commit-id: f0e1b80cd2
2013-03-29 09:52:46 -05:00
Greg Armendariz
05af592718 Change package location of import
Former-commit-id: f778112c20 [formerly d533c5c08d] [formerly 27345f6edf [formerly c158a7540d23451b864a1464ab64882c3d45386d]]
Former-commit-id: 27345f6edf
Former-commit-id: 089dfc87e6
2013-03-29 09:09:32 -05:00
David Gillingham
fddd42615d Issue #1837: Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0

Former-commit-id: 170f252bdd [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]
Former-commit-id: c9ed59b0e0
Former-commit-id: dbec0fa00f
2013-03-28 17:18:43 -05:00
Steve Harris
bec6e9099f Issue #1782 - restore FFPMGenerator.java
Former-commit-id: f01b5fb849 [formerly e67dbb206e] [formerly 3953f8368b [formerly 813033f4a2b30a669646b288eb00959922f0e804]]
Former-commit-id: 3953f8368b
Former-commit-id: a74d22efc5
2013-03-28 16:06:54 -05:00