Roger Ferrel
eee55dc50e
Issue #1790 Changes for non-blocking StationReportingStatusDlg.
...
Change-Id: Icd11c338c2bc7399c10205d10d3c11ff034d61d7
Former-commit-id: 92e7fd93ae
[formerly aa11977fd3
] [formerly 1ba7a11037
] [formerly 92e7fd93ae
[formerly aa11977fd3
] [formerly 1ba7a11037
] [formerly af0aa091f3
[formerly 1ba7a11037
[formerly ec789fc71009b77d6f44b7eba606ba5259d253a8]]]]
Former-commit-id: af0aa091f3
Former-commit-id: 9bf8d730fe
[formerly b49ab42ce1
] [formerly c979a138d9f080bce3b8a3771ff07f0fc114701b [formerly 2020d82599
]]
Former-commit-id: a2e4ae601f5fe8088132377f789482fb4b87e8f3 [formerly c1e1f3786f
]
Former-commit-id: ae72f407b0
2013-04-16 12:51:18 -05:00
Dustin Johnson
28c46eecf0
Issue #1910 Add some tests of the LifecycleManager SubmitObjects functionality
...
Change-Id: Ieb1544cb52cf108836b157e3d800c470fa5cf3e1
Former-commit-id: 8e03494192
[formerly 67e49201d6
] [formerly 255aea053b
] [formerly 8e03494192
[formerly 67e49201d6
] [formerly 255aea053b
] [formerly 58b6899672
[formerly 255aea053b
[formerly c4344f5402fe33e7e47515adc3b54913f9c13617]]]]
Former-commit-id: 58b6899672
Former-commit-id: 075d051b56
[formerly ce9f5a7365
] [formerly c84b45e2152655f5a59d981bf77540a6031f9e67 [formerly cb899b3fa0
]]
Former-commit-id: f8cd2df5b9ed6f18304af15249e41da5c1aeb6e8 [formerly 522549fc3a
]
Former-commit-id: ea37022631
2013-04-16 11:30:06 -05:00
Dustin Johnson
318afbcd20
Issue #1906 Remove new registry plugin from datadelivery feature
...
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598
Former-commit-id: 33e650fa62
[formerly e44d3a8715
] [formerly c8241840c5
] [formerly 33e650fa62
[formerly e44d3a8715
] [formerly c8241840c5
] [formerly 977702e876
[formerly c8241840c5
[formerly 71b4bb07870f5490d89a1fe657429444c54a2689]]]]
Former-commit-id: 977702e876
Former-commit-id: f62c676204
[formerly ee0572026a
] [formerly 8f6f2752a97faad2cc1abe1217e10c837c560006 [formerly 8170693941
]]
Former-commit-id: 21eccbdc435b0685d83b3d9b97371ed96a747b6f [formerly 8095deee57
]
Former-commit-id: ff9f489fea
2013-04-16 10:36:56 -05:00
Richard Peter
02428a03c0
Merge "Issue #1787 Fixed to support changes to D2D grid location" into omaha_13.4.1
...
Former-commit-id: 244e7ab8da
[formerly 30e77171ab
] [formerly 390bf03c39
] [formerly 244e7ab8da
[formerly 30e77171ab
] [formerly 390bf03c39
] [formerly 5a11d3cc1c
[formerly 390bf03c39
[formerly 73e3a04a98ced3670c61b5debacdfc79d494ab29]]]]
Former-commit-id: 5a11d3cc1c
Former-commit-id: 865883a366
[formerly 4ed90bf67a
] [formerly d87a04feb7e6045446d19ab85351d3ff8bbcfc93 [formerly 6be394ba64
]]
Former-commit-id: 34fb3acaa8ea91a8bc7f1711b794a9c11e20ef9e [formerly d2354e13ec
]
Former-commit-id: e4c7161748
2013-04-16 09:35:12 -05:00
Dustin Johnson
211b47bdc6
Issue #1906 Remove use of hibernate columnDefinition from SubscriptionType
...
Change-Id: I310914180865ca65290c48dc1c55f9dc11f3c044
Former-commit-id: 7e34412788
[formerly 3e5ace2cf3
] [formerly 391a7bb999
] [formerly 7e34412788
[formerly 3e5ace2cf3
] [formerly 391a7bb999
] [formerly 8b38dec4bb
[formerly 391a7bb999
[formerly 67ff37feac0998378a30c09894fab7ea0dbd84f8]]]]
Former-commit-id: 8b38dec4bb
Former-commit-id: c4a90e6657
[formerly 395e4db621
] [formerly febfd9de5ac996a392f5d941c8e8c6d3e649328a [formerly 80ff75c473
]]
Former-commit-id: 28affc9bb37211f0061b20d17640270f1d93f550 [formerly 6302ad04b4
]
Former-commit-id: 493f6d3aa5
2013-04-16 08:08:47 -05:00
Ron Anderson
c0f2c84b19
Issue #1787 Fixed to support changes to D2D grid location
...
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c
Former-commit-id: f0e2bf8755
[formerly 4ea01a29ce
] [formerly c233ce042d
] [formerly f0e2bf8755
[formerly 4ea01a29ce
] [formerly c233ce042d
] [formerly 4cd87f2726
[formerly c233ce042d
[formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]]]
Former-commit-id: 4cd87f2726
Former-commit-id: f10107fef4
[formerly 24a6a3590f
] [formerly c8230f228e91a9f3155cde9baf0651765c522e16 [formerly e9f674a575
]]
Former-commit-id: f8d56d18af251880f893a19b401fdc01b452c187 [formerly 89a2d99bfe
]
Former-commit-id: 4dd37ae7cd
2013-04-15 18:02:47 -05:00
Dave Hladky
99d0c3901c
Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
...
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8
Former-commit-id: bb6814beef
[formerly c52445652a
] [formerly 60fa768195
] [formerly bb6814beef
[formerly c52445652a
] [formerly 60fa768195
] [formerly 978e68d893
[formerly 60fa768195
[formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]]
Former-commit-id: 978e68d893
Former-commit-id: 1ca77b427f
[formerly d0ec4f0d87
] [formerly c72d0a748e1272940a038261a3b8315e8fd1eeee [formerly 5789936212
]]
Former-commit-id: a2225196ae722fa9348d20acb31f2d406f2af39b [formerly 0f7843f0b7
]
Former-commit-id: 14a08d6f66
2013-04-15 17:58:06 -05:00
Bryan Kowal
de0546ca99
Issue #1814 - use the AWIPS II log4j.xml for qpid
...
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1
Former-commit-id: 715befa75c
[formerly e720bf74b5
] [formerly e00a6207a5
] [formerly 715befa75c
[formerly e720bf74b5
] [formerly e00a6207a5
] [formerly 35b956fc4c
[formerly e00a6207a5
[formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]]]
Former-commit-id: 35b956fc4c
Former-commit-id: 02f01470fc
[formerly 49b9046bb4
] [formerly a0bd420b00b18b43fbffb1d90f2d5c751a02e44a [formerly cbc2742070
]]
Former-commit-id: f2ac9bf75c2eac62c3ddae97b705ade27423325b [formerly 39bae3cc54
]
Former-commit-id: 6ad82744d2
2013-04-15 16:38:00 -05:00
Lee Venable
99bf297190
Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
...
Former-commit-id: c23b6d31d5
[formerly 9ae56e2172
] [formerly 8723d88a19
] [formerly c23b6d31d5
[formerly 9ae56e2172
] [formerly 8723d88a19
] [formerly 8c8709f4a6
[formerly 8723d88a19
[formerly 042819679ba8e0d22695b41059772da841619f29]]]]
Former-commit-id: 8c8709f4a6
Former-commit-id: 953d3f79fb
[formerly b18fa4f6bf
] [formerly 3ebd30bd68f66548fee71c2096f5598c7cdba3aa [formerly 1674a59ed3
]]
Former-commit-id: b694b850da12576a75b20bb91bfeb2f285ef290a [formerly ec3f0c0a11
]
Former-commit-id: 783df0394c
2013-04-15 15:33:53 -05:00
Nate Jensen
2fa9a1cc65
Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development
...
Former-commit-id: 7e6cbbeca8
[formerly 56c1fe7422
] [formerly 0cbf561f7c
] [formerly 7e6cbbeca8
[formerly 56c1fe7422
] [formerly 0cbf561f7c
] [formerly d411aad285
[formerly 0cbf561f7c
[formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]]]
Former-commit-id: d411aad285
Former-commit-id: 959a8867e9
[formerly d785d3f1c2
] [formerly 13c131b4ba733ec8bfe111d53be343dd584dd76c [formerly 9d0e3fd0c2
]]
Former-commit-id: 8612484a7e2a30162bc90a91e8c23595f6b0fdca [formerly 2eaf49612c
]
Former-commit-id: f8c3cb4589
2013-04-15 14:57:03 -05:00
Matt Nash
35f5d4167e
Issue #1870 add package-info.java so that the empty src directory gets pushed to git
...
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840
Former-commit-id: 24711d9f2c
[formerly 7ffb45758d
] [formerly 0d12fb16bc
] [formerly 24711d9f2c
[formerly 7ffb45758d
] [formerly 0d12fb16bc
] [formerly 4b896002ac
[formerly 0d12fb16bc
[formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]]]
Former-commit-id: 4b896002ac
Former-commit-id: c3b78dcb45
[formerly 317cbf0950
] [formerly 3171c53715c04eee22a513fc63775f14cec341d2 [formerly 87af6d2809
]]
Former-commit-id: 07f95159ba72d1a2635b6c0d391a0b4e90166b2a [formerly a2e421048c
]
Former-commit-id: a8358a4b40
2013-04-15 14:53:07 -05:00
Lee Venable
a0b531c77c
Merge "Issue #1904 - FFMPConfig no longer able to be reset." into development
...
Former-commit-id: 8e6df2e9d3
[formerly 966085d878
] [formerly c5c885b28b
] [formerly 8e6df2e9d3
[formerly 966085d878
] [formerly c5c885b28b
] [formerly 770f473bf7
[formerly c5c885b28b
[formerly 72178a388b7114f92146ba7fbb1eb062cbeb7aa4]]]]
Former-commit-id: 770f473bf7
Former-commit-id: e3cbfade68
[formerly 42aefd0d77
] [formerly 5f29c43af6ad720000ce8d1a56c8387e3b877f46 [formerly 668a5133f6
]]
Former-commit-id: fa5006089d4ea7509db536bbacb7cf61a6246369 [formerly e1c360ca37
]
Former-commit-id: 71870d782c
2013-04-15 13:11:34 -05:00
Mike Duff
02bf3e1d48
Issue #1904 - FFMPConfig no longer able to be reset.
...
Change-Id: I9e7a7628ca1cd77964574fbc84c2cd2f78364872
Former-commit-id: 9a8923cf82
[formerly 2323505f91
] [formerly 18e5561dd2
] [formerly 9a8923cf82
[formerly 2323505f91
] [formerly 18e5561dd2
] [formerly f9c0de442f
[formerly 18e5561dd2
[formerly 5775e40e5f939ca847527ae562cba71dc3984a60]]]]
Former-commit-id: f9c0de442f
Former-commit-id: 26608d531a
[formerly b847733566
] [formerly 36fc9749d17f3bc86588c0116afda4c80360c858 [formerly c0f6fe5199
]]
Former-commit-id: b31f526c50f353b0f4a46389e95c78a739532bb3 [formerly 5253e6e535
]
Former-commit-id: 00b3600ad6
2013-04-15 13:02:58 -05:00
Richard Peter
06b54e67c5
Issue #1814 : Change baseline memory configuration and baseline default log configuration
...
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3
Former-commit-id: 81749b9af5
[formerly c10d2f7520
] [formerly 0c869ee231
] [formerly 81749b9af5
[formerly c10d2f7520
] [formerly 0c869ee231
] [formerly 78b230aaaf
[formerly 0c869ee231
[formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]]
Former-commit-id: 78b230aaaf
Former-commit-id: 227dcdbd81
[formerly a281d26608
] [formerly 9271b9a667b720d809e7d8db48bb876251b35cf8 [formerly d967301cfc
]]
Former-commit-id: b526a87e57e2ff9413674036431ad8b679510a09 [formerly 4e9789f56d
]
Former-commit-id: ec77d423fe
2013-04-15 12:52:40 -05:00
Dustin Johnson
f612144af5
Merge "Issue #1802 Implemented ebxml registry replication" into development
...
Former-commit-id: 7adacb156f
[formerly 20ee731e62
] [formerly 4276b4efa1
] [formerly 7adacb156f
[formerly 20ee731e62
] [formerly 4276b4efa1
] [formerly 52095664e0
[formerly 4276b4efa1
[formerly 51fea5de5df2ff5ad2169614fb6f4d64ea586c6b]]]]
Former-commit-id: 52095664e0
Former-commit-id: c4c9410c7c
[formerly 7268795739
] [formerly a00faa9243a806c03f5904839eb3dd5753530c7d [formerly fdf0f29feb
]]
Former-commit-id: 0f1cce6c8e48e5dd09a26d1bc35a69cf65027124 [formerly a66aceef23
]
Former-commit-id: e5c79edc53
2013-04-15 12:42:23 -05:00
Bryan Kowal
b36387d51a
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: 52f1aa5fda
[formerly 0800c14061
] [formerly cca3f43736
] [formerly 52f1aa5fda
[formerly 0800c14061
] [formerly cca3f43736
] [formerly c797715efe
[formerly cca3f43736
[formerly d0fe712b37f7890c547470b24139635183ee9e1e]]]]
Former-commit-id: c797715efe
Former-commit-id: 763c9b7ca1
[formerly 8e27924557
] [formerly b54c980ffdd49821d2302b071c9aecdca092cc4e [formerly 671e600a62
]]
Former-commit-id: 0fab5d61e84d36cac7de1d7a1c9c9c43112cb824 [formerly fa59505e28
]
Former-commit-id: 7db0542069
2013-04-15 09:40:43 -05:00
Mike Duff
c53f202b19
Issue #1902 - FFMP permormance/cleanup
...
peer review comments
Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15
Former-commit-id: dc8e37c0df
[formerly 8271eaf328
] [formerly 020713663a
] [formerly dc8e37c0df
[formerly 8271eaf328
] [formerly 020713663a
] [formerly 85f1aba297
[formerly 020713663a
[formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]]
Former-commit-id: 85f1aba297
Former-commit-id: 41b00b0d6d
[formerly 7a1809afca
] [formerly 3c48d99b3e2289bad30a4264bbe35a37469181cf [formerly f61bae1c3e
]]
Former-commit-id: 4b99fb61085242237b0321d02bcd5fb3d32fea55 [formerly 812599d8db
]
Former-commit-id: feb9fc93ef
2013-04-15 09:40:07 -05:00
Steve Harris
0d89c11bf1
Merge branch 'master_13.3.1' into omaha_13.4.1
...
Former-commit-id: bc46b3803f
[formerly 97790b0d3e
] [formerly 6dc19411c1
] [formerly bc46b3803f
[formerly 97790b0d3e
] [formerly 6dc19411c1
] [formerly bdefa9f20f
[formerly 6dc19411c1
[formerly cb0c44c44331d64e566905a166abf132f6a5817b]]]]
Former-commit-id: bdefa9f20f
Former-commit-id: c425411d92
[formerly a6ccaf52d4
] [formerly 8c3599e7ee240df84defae2bc7978ccea1279afd [formerly 85bebd026e
]]
Former-commit-id: 8f17443f179dc02a6109a68f0452c0dbc8b41a4e [formerly 7144ec32e9
]
Former-commit-id: b446c96698
2013-04-15 09:37:29 -05:00
Steve Harris
aded012c47
Merge branch 'master_13.3.1' into master_13.4.1
...
Former-commit-id: 9d57ad1675
[formerly 035878a846
] [formerly 7957c52dec
] [formerly 9d57ad1675
[formerly 035878a846
] [formerly 7957c52dec
] [formerly e6d37f3e6d
[formerly 7957c52dec
[formerly 59bd064351a843fd514514de9dc942d13c6d7793]]]]
Former-commit-id: e6d37f3e6d
Former-commit-id: f5ccd224d4
[formerly e11088fefd
] [formerly 0cf541c2cb1fdf3ce52a0d77346996fa9e50b39b [formerly ad51361408
]]
Former-commit-id: 715a0385d4823349042ed884044c65dde8a975bf [formerly 01dfc19f60
]
Former-commit-id: 7dbffd78a1
2013-04-15 09:34:45 -05:00
Steve Harris
99d89adc2e
13.3.1-20 baseline
...
Former-commit-id: 9e73c3f1ed
[formerly 07f7e6e2b4
] [formerly 25432cc388
] [formerly 9e73c3f1ed
[formerly 07f7e6e2b4
] [formerly 25432cc388
] [formerly 446bec6f49
[formerly 25432cc388
[formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]]]
Former-commit-id: 446bec6f49
Former-commit-id: 1749ff8a3c
[formerly 8535bceb4c
] [formerly 48c43f807cd6cab814e5d057a67effdc5c9ea638 [formerly 4b71131386
]]
Former-commit-id: 03e22585dd1936fc2af32023a5ae3b65d4f222f9 [formerly 44cd8d47fb
]
Former-commit-id: 953ffdab87
2013-04-15 08:58:59 -05:00
Ron Anderson
f96fdd67ef
Merge "Issue #1845 : Fix gfeNotify with java qpid broker" into omaha_13.4.1
...
Former-commit-id: e129ae4a36
[formerly 4e62fbdd54
] [formerly df06966a09
] [formerly e129ae4a36
[formerly 4e62fbdd54
] [formerly df06966a09
] [formerly 428fdebd9e
[formerly df06966a09
[formerly f23561f863b623b230b19ef2075560507fc61fb6]]]]
Former-commit-id: 428fdebd9e
Former-commit-id: c831fc3292
[formerly b60c6b19e6
] [formerly 7037a1c300eb4f108baf28b024ae5151c842fd6c [formerly c4d754d75e
]]
Former-commit-id: 5aadb48146ad8988f94e7065e62dd3b1f0cc181f [formerly e01f6a0f7f
]
Former-commit-id: dca0eeb302
2013-04-15 08:27:42 -05:00
Nate Jensen
4ea7202999
Merge "Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil." into omaha_13.4.1
...
Former-commit-id: d3517fbb70
[formerly ea2c0e6c40
] [formerly b24ccfd7a3
] [formerly d3517fbb70
[formerly ea2c0e6c40
] [formerly b24ccfd7a3
] [formerly a422709ab6
[formerly b24ccfd7a3
[formerly bc12d9c818b72ae16c485a33719817bd15301bca]]]]
Former-commit-id: a422709ab6
Former-commit-id: 0e59bce548
[formerly bee4f5fafd
] [formerly e364f2da4f532bb4457a194e508a8bcd3c974e67 [formerly 32ea01b8b8
]]
Former-commit-id: cd1b8414b4907b1d08d2be7d5ff13465b1732892 [formerly e2f072f2d5
]
Former-commit-id: f1c3f25368
2013-04-12 12:39:12 -05:00
Richard Peter
f9e73b5287
Issue #1845 : Fix gfeNotify with java qpid broker
...
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193
Former-commit-id: efe0dce3ed
[formerly 4e3e044281
] [formerly 025600f4cb
] [formerly efe0dce3ed
[formerly 4e3e044281
] [formerly 025600f4cb
] [formerly a6ffc663a9
[formerly 025600f4cb
[formerly 9f3806e9579cef66d0a40a290d9d36a089f2b3d6]]]]
Former-commit-id: a6ffc663a9
Former-commit-id: 1900f948ea
[formerly c613cfb4da
] [formerly 39f79af483b4fc0c6b07a413de9dad0dd3860164 [formerly 207b4cafcc
]]
Former-commit-id: 73092e863762bde5401473994af6d738c9656237 [formerly 153e552f8a
]
Former-commit-id: 2110908015
2013-04-12 12:04:54 -05:00
Benjamin Phillippe
3733212782
Issue #1802 Implemented ebxml registry replication
...
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531
Former-commit-id: fa6cdf46db
[formerly e3f3483b51
] [formerly 120906de78
] [formerly fa6cdf46db
[formerly e3f3483b51
] [formerly 120906de78
] [formerly ec69cdeb44
[formerly 120906de78
[formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]]]
Former-commit-id: ec69cdeb44
Former-commit-id: 0a930ce83c
[formerly e5fbf006dd
] [formerly 8dba2ff501e80c05042800d7e6c73e3267e77ee2 [formerly c0099a8a39
]]
Former-commit-id: 95c16add15912c7c114c1119ff48e3bd9099e7ee [formerly d9b5511b8b
]
Former-commit-id: 1967c632e5
2013-04-12 11:27:45 -05:00
Roger Ferrel
1d036eb29c
Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
...
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9
Former-commit-id: 04ab641171
[formerly 1258e12e11
] [formerly 842852d975
] [formerly 04ab641171
[formerly 1258e12e11
] [formerly 842852d975
] [formerly 4c15be46a0
[formerly 842852d975
[formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]]]
Former-commit-id: 4c15be46a0
Former-commit-id: a8534ec26f
[formerly 0b7d85a43f
] [formerly 7701c00608738698fe5760f22807ef2cffec9b97 [formerly e3bacfb9f0
]]
Former-commit-id: c26b591296e8b58697fbaeae88fdab31fbcd248d [formerly 94c372088d
]
Former-commit-id: 5a6926dfa3
2013-04-12 11:10:13 -05:00
Bryan Kowal
646d4f067b
Issue #1901 - EDEX will no longer automatically be killed during shutdown
...
Former-commit-id: 45b8575578
[formerly fabebb7adf
] [formerly 36fa6f932b
] [formerly 45b8575578
[formerly fabebb7adf
] [formerly 36fa6f932b
] [formerly 81423bdca1
[formerly 36fa6f932b
[formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]]]
Former-commit-id: 81423bdca1
Former-commit-id: 90a8ca12d2
[formerly d2cb482ead
] [formerly 609c94b5216a83b09b52f79feb470218cac58979 [formerly 694e7fe9ee
]]
Former-commit-id: 8c1a7fda765eab54cc27b183d9a9717bfa14e11c [formerly 28570210c6
]
Former-commit-id: 272441938c
2013-04-12 10:36:15 -05:00
David Gillingham
e7e405a2b8
Issue #1898 : Modify service backup export_configuration script to also include site's map bundles.
...
Former-commit-id: a3003e5e07
[formerly 967ec40df6
] [formerly d5c8ecc6d3
] [formerly a3003e5e07
[formerly 967ec40df6
] [formerly d5c8ecc6d3
] [formerly 7303425900
[formerly d5c8ecc6d3
[formerly d197bc7fef0ca97f533d5270625b5e696ab29dca]]]]
Former-commit-id: 7303425900
Former-commit-id: 48f984f712
[formerly d9035f421c
] [formerly 39ff6f5c3e931b1e24bfdda8798342c2b31f95c8 [formerly b6201bba2f
]]
Former-commit-id: 6e7ea9ae22125510690ad51699dbbc6463ee34ef [formerly 30493697f8
]
Former-commit-id: 73ea61a34d
2013-04-12 09:50:47 -05:00
Nate Jensen
55bd1ec462
Merge "Issue #1871 convert parameters to Strings and make sure to return them" into development
...
Former-commit-id: 5d1ac53113
[formerly 00f75a3063
] [formerly e8218d0e3c
] [formerly 5d1ac53113
[formerly 00f75a3063
] [formerly e8218d0e3c
] [formerly fe163c5c16
[formerly e8218d0e3c
[formerly e9df9576305b7d58b92de6917675f8c38c020270]]]]
Former-commit-id: fe163c5c16
Former-commit-id: f9f1f8f90b
[formerly 0c1f005323
] [formerly 92e15411439e9d0363bbc5a3f47495bce0b94afc [formerly e6a24551af
]]
Former-commit-id: 3aa9e62cf9cb50220eb2e86b4a8d4101ad84d2ef [formerly 0b2851bb05
]
Former-commit-id: 3d50900ab3
2013-04-12 09:31:52 -05:00
Matt Nash
9044f422ba
Issue #1871 convert parameters to Strings and make sure to return them
...
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7
Former-commit-id: 6f12e80c0d
[formerly 64323fc0af
] [formerly cd77308fac
] [formerly 6f12e80c0d
[formerly 64323fc0af
] [formerly cd77308fac
] [formerly 6c488cee05
[formerly cd77308fac
[formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]]]
Former-commit-id: 6c488cee05
Former-commit-id: 6e4cdda323
[formerly 4ee6085bda
] [formerly b7dde24ffa640c3ec2a075a60bbac138bc9b7837 [formerly 7dd72ab7d5
]]
Former-commit-id: bb7a2e01e84d6a44c089c22831f81e386f072be2 [formerly 6969b0c0ae
]
Former-commit-id: 63a13ef503
2013-04-12 09:31:23 -05:00
Matt Nash
eb17cb0e94
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: 01e9ab8a06
[formerly 2ab1cf8abb
] [formerly 3af61d7117
] [formerly 01e9ab8a06
[formerly 2ab1cf8abb
] [formerly 3af61d7117
] [formerly b44ee44664
[formerly 3af61d7117
[formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]]]
Former-commit-id: b44ee44664
Former-commit-id: 6a755f6a4b
[formerly e6fc7942b8
] [formerly 2a5d354ea6b4a6308cc09c3d485c9d2ea3778f71 [formerly c95e825d35
]]
Former-commit-id: 8b3973aa378e7fd3ef3866d756662f36aa72b401 [formerly 7b25f73a9a
]
Former-commit-id: dc0f234f02
2013-04-12 09:31:16 -05:00
Matt Nash
4de612db14
Issue #1871 make Java data access class better match Python version
...
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051
Former-commit-id: 9ed1c330a6
[formerly baafdafed7
] [formerly 68c84fd8cc
] [formerly 9ed1c330a6
[formerly baafdafed7
] [formerly 68c84fd8cc
] [formerly 4ac6480f52
[formerly 68c84fd8cc
[formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]]]
Former-commit-id: 4ac6480f52
Former-commit-id: eccbf5b9aa
[formerly 705be14b64
] [formerly 1f8e933ae077261e7dc5b72f7658f41f6a5c2ec0 [formerly 7ffd8efcf2
]]
Former-commit-id: b35c0c7badac7ea42a21c3abe131663d37ff3729 [formerly af190ad278
]
Former-commit-id: 7f52894c51
2013-04-12 09:31:07 -05:00
Nate Jensen
2194f0341f
Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
...
Former-commit-id: 304be5221b
[formerly 03fac8cb06
] [formerly 36ad161721
] [formerly 304be5221b
[formerly 03fac8cb06
] [formerly 36ad161721
] [formerly 8561b201d5
[formerly 36ad161721
[formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]]]
Former-commit-id: 8561b201d5
Former-commit-id: 6adb90b87f
[formerly 12d4837e78
] [formerly 8cdb4eceeef8bfd82310e77ac754c36c3a8c9e20 [formerly 826e64a990
]]
Former-commit-id: 62adc7e0cacffa942ec26dadd9b3c228ff2e7383 [formerly 7c22745ac0
]
Former-commit-id: 6a16f63002
2013-04-12 09:30:38 -05:00
Matt Nash
0985877ac1
Issue #1870 implement PathManager interface in Python to allow Python code to
...
get files
Change-Id: I0192c996533b1539194aaeba0213074bef8a4717
Former-commit-id: 054c9afeed
[formerly 68892951c5
] [formerly bf01f50e17
] [formerly 054c9afeed
[formerly 68892951c5
] [formerly bf01f50e17
] [formerly 4b23ec7c0a
[formerly bf01f50e17
[formerly e3df8efa51ad95c952318b59edca702157a59856]]]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: 6f32d989c4
[formerly 123351e82b
] [formerly 593118c2fd517ea4ccef855699786a9ac5386ea8 [formerly caf1f1fdf7
]]
Former-commit-id: d7376844fc5a64a79ad485ae990bc811691e6589 [formerly d6feca69b4
]
Former-commit-id: b6d567fd72
2013-04-12 07:55:56 -05:00
Bryan Kowal
43ec29fec3
Issue #1897 - updated from PostgreSQL 9.2.3 to PostgreSQL 9.2.4
...
Former-commit-id: ea560bc843
[formerly cc0748d2d9
] [formerly 331ca69086
] [formerly ea560bc843
[formerly cc0748d2d9
] [formerly 331ca69086
] [formerly 765569f139
[formerly 331ca69086
[formerly 64f31d1f7c2c01eee91cfb4de68fbc01a73ae113]]]]
Former-commit-id: 765569f139
Former-commit-id: cb1af6d7dd
[formerly 2fca1ce506
] [formerly 608f24572f3c70daec845beeedf1886c792d5f78 [formerly 73e3d99f47
]]
Former-commit-id: 63728125a3c81187c19b92409dc975f9f611ab60 [formerly f30c1fb3cf
]
Former-commit-id: 64cfb4f79d
2013-04-11 18:06:42 -05:00
Steve Harris
23ba5b6690
Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
Former-commit-id: 58848dbf11
[formerly 0d86b95f1b
] [formerly 55d9909d6d
] [formerly 58848dbf11
[formerly 0d86b95f1b
] [formerly 55d9909d6d
] [formerly 0fed14d765
[formerly 55d9909d6d
[formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]]]
Former-commit-id: 0fed14d765
Former-commit-id: 6f691692bb
[formerly 55dda49d47
] [formerly 9971801ff7675d72352d78bac25edb59dd4b1b9c [formerly fe6a078c64
]]
Former-commit-id: 55c3e4f9cc9b0427394c00bf35baeeaf592f669f [formerly a9d3e94b3b
]
Former-commit-id: 98fd30b0d5
2013-04-11 13:14:00 -05:00
Steve Harris
3f9dac0cae
Issue #1862 - Tarfile part of: set_hydro_env now looks up db driver
...
Former-commit-id: 7447270b78
[formerly f95c1746fe
] [formerly 1de937229f
] [formerly 7447270b78
[formerly f95c1746fe
] [formerly 1de937229f
] [formerly bb0ad5b16a
[formerly 1de937229f
[formerly ac202b9d79c530276e92a3e98ce097a8d1a620f2]]]]
Former-commit-id: bb0ad5b16a
Former-commit-id: 8b026d0e41
[formerly 7ff742821c
] [formerly 772e4dcd27b8a3bd07e36e25454e9ae341a6616b [formerly 78b0a992f7
]]
Former-commit-id: 633aa1a079825a8a97818c6412585190c678f644 [formerly 28dca96d8f
]
Former-commit-id: c6cef08ad4
2013-04-11 12:49:31 -05:00
Lee Venable
5fd6e9b5af
Merge "Issue #1862 - set_hydro_env now looks up db driver jar dynamically Peer review comments" into omaha_13.4.1
...
Former-commit-id: ad4ef907c9
[formerly d1640829b9
] [formerly df3a446c96
] [formerly ad4ef907c9
[formerly d1640829b9
] [formerly df3a446c96
] [formerly 04713029bf
[formerly df3a446c96
[formerly de28fa98b53242155213b7c66b54fe146166816d]]]]
Former-commit-id: 04713029bf
Former-commit-id: b5ed8b93e0
[formerly 81a8d4bf28
] [formerly e18d3b0b00eb7aad8b1647e895f97c4aaf6f2999 [formerly 09e0e0647a
]]
Former-commit-id: 74c3b0d078b17826855f5eebc13f35403a0d5cdb [formerly b4fab18ed1
]
Former-commit-id: d87eccac1e
2013-04-11 12:14:04 -05:00
Mike Duff
5eab1e1559
Issue #1862 - set_hydro_env now looks up db driver jar dynamically
...
Peer review comments
Change-Id: I6904da96e89930b6efa802ec6302cc7a7d36a3d9
Former-commit-id: f11f5487a9
[formerly 07ab20ccfe
] [formerly d981d74087
] [formerly f11f5487a9
[formerly 07ab20ccfe
] [formerly d981d74087
] [formerly 13542f3d70
[formerly d981d74087
[formerly c58285e63aa18eca991ebce3c408a298b09efe8c]]]]
Former-commit-id: 13542f3d70
Former-commit-id: 4fbcf0b5ec
[formerly c94836e7cf
] [formerly 54097d9455326e40bbf18c6776078d27d9412ed5 [formerly 57cc934d76
]]
Former-commit-id: 47514a9ff0bda755b5df9ed094367d54b4b2ee1b [formerly 87421c52bb
]
Former-commit-id: 079cbbc6d6
2013-04-11 12:12:58 -05:00
Dave Hladky
4b22280cf7
Issue #1886 double pfaf in mouseover text
...
Change-Id: I4f89aede6985126cfda5491b6df5bc4e18f34362
Former-commit-id: dc91e88853
[formerly ed0afbec22
] [formerly 7c1e2eddbc
] [formerly dc91e88853
[formerly ed0afbec22
] [formerly 7c1e2eddbc
] [formerly 53fbf8815e
[formerly 7c1e2eddbc
[formerly e1d484049e276877ef4327b5fbd8d722e1eda20c]]]]
Former-commit-id: 53fbf8815e
Former-commit-id: cbec86f7c1
[formerly 18b34a2b16
] [formerly 894251a20da8c03e9af9f8f74719957d93e09ae1 [formerly 8e1e4bb5f0
]]
Former-commit-id: 921961dc4e0f0d6aeab6aad9d5508e0fdc1f28ec [formerly cca803dac3
]
Former-commit-id: 2adea3bb0a
2013-04-11 09:06:03 -05:00
Bryan Kowal
a82f5189a2
Merge "Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades." into omaha_13.4.1
...
Former-commit-id: a24885cb34
[formerly 8e78666902
] [formerly cce4b819c9
] [formerly a24885cb34
[formerly 8e78666902
] [formerly cce4b819c9
] [formerly a792a0246b
[formerly cce4b819c9
[formerly 655d6f29a5f9667dad6900a6dc2562968d8c8fcb]]]]
Former-commit-id: a792a0246b
Former-commit-id: 29022ce97c
[formerly 893074643b
] [formerly 980f49bed4a3d19f4d98fbbac2b4204254a112fa [formerly 7f482f0335
]]
Former-commit-id: 6b35a5c87d050e3dcdcca1f6827d2e0a1d6d30db [formerly 435162efc7
]
Former-commit-id: 695fe29564
2013-04-10 18:29:52 -05:00
Bryan Kowal
53fa990b4f
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: a05a76ddc7
[formerly b4f51b7c46
] [formerly c28286b9ef
] [formerly a05a76ddc7
[formerly b4f51b7c46
] [formerly c28286b9ef
] [formerly ef5dcf4489
[formerly c28286b9ef
[formerly f49bb80458be42996555e5692a3403f2befad77b]]]]
Former-commit-id: ef5dcf4489
Former-commit-id: 1febd44526
[formerly cfba1ca4a1
] [formerly 5e9169f18c9492cd2c9ad5add270ebdb91a0bb83 [formerly 3baf4ada50
]]
Former-commit-id: 5e8c84136fb3961a6952685075219cf2eac3143c [formerly cd5d97fb3b
]
Former-commit-id: 435ae4fd18
2013-04-10 18:27:52 -05:00
Richard Peter
db6445105a
Merge "Issue #1805 - incremented the python qpid release" into omaha_13.4.1
...
Former-commit-id: 6a4fc2bd2d
[formerly 8ce7032f07
] [formerly d8a0b43df2
] [formerly 6a4fc2bd2d
[formerly 8ce7032f07
] [formerly d8a0b43df2
] [formerly 3fe70ff22c
[formerly d8a0b43df2
[formerly ac8837195f4861988b39062b252e7e3fb7133ed5]]]]
Former-commit-id: 3fe70ff22c
Former-commit-id: 5dc100a3a4
[formerly 2288cca1d4
] [formerly 21777af42087d19b344b843a27b2e0e498d433e3 [formerly a4c8810322
]]
Former-commit-id: 6fe1ef0ff99334706a26a5475bc5d753462c8fb5 [formerly d59374ef90
]
Former-commit-id: 45afedc941
2013-04-10 16:58:17 -05:00
Richard Peter
3438a72f90
Merge "Issue #1874 - created external properties files for specifying the number of grib decode threads" into omaha_13.4.1
...
Former-commit-id: 7816a9baa7
[formerly b29d274316
] [formerly a244fe0cd0
] [formerly 7816a9baa7
[formerly b29d274316
] [formerly a244fe0cd0
] [formerly 7f25a86e4d
[formerly a244fe0cd0
[formerly cd417d34a230322f80dd48eb59416c938697320d]]]]
Former-commit-id: 7f25a86e4d
Former-commit-id: 15d71da33c
[formerly 8c91f737ba
] [formerly a7c21f40d383d897d678d7ec0012da4e96ed8550 [formerly 830ec7274c
]]
Former-commit-id: 99953595a248d6869d12f05b1c114ec8d9100fc4 [formerly c0e4cca8a4
]
Former-commit-id: a1228d7830
2013-04-10 16:57:38 -05:00
Bryan Kowal
ea661ea9fe
Issue #1805 - incremented the python qpid release
...
Former-commit-id: 7dab615cd8
[formerly 12d16daeed
] [formerly c146f1835b
] [formerly 7dab615cd8
[formerly 12d16daeed
] [formerly c146f1835b
] [formerly 2bfd416f13
[formerly c146f1835b
[formerly f2c5c819d91ad851d82444865b4279f85e13f791]]]]
Former-commit-id: 2bfd416f13
Former-commit-id: 3d7a62e041
[formerly 1ac1d10e40
] [formerly d4ecf11f646728c016c9ca2cbb65890bec2f842b [formerly 6c7cad26f0
]]
Former-commit-id: 115f53aff9ec1bbc95805bbfd0235e0a667d1fbf [formerly c1202c7331
]
Former-commit-id: efb15a5474
2013-04-10 16:49:20 -05:00
Bryan Kowal
39990c9ded
Issue #1874 - created external properties files for specifying the number of grib decode threads
...
- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers
Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff
Former-commit-id: d1799b4e0f
[formerly 4ef22f8e93
] [formerly eb04d2b85f
] [formerly d1799b4e0f
[formerly 4ef22f8e93
] [formerly eb04d2b85f
] [formerly b5994702dc
[formerly eb04d2b85f
[formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]]]
Former-commit-id: b5994702dc
Former-commit-id: 2393357287
[formerly fa1e0a02b0
] [formerly e08966d5518c4d5452b179ec7af6e2e7ae211afb [formerly a60f14f5d6
]]
Former-commit-id: 3dc62f85f55a788efee36beacca6b2db42c94fc7 [formerly 2ac40dd058
]
Former-commit-id: d64370525b
2013-04-10 16:24:39 -05:00
Ron Anderson
d46d0869ea
Issue #1854 Fix for compatibility with PostGIS 2.0
...
Change-Id: I5b6ff34c823302b8db466d8e27130904bf4b82c3
Former-commit-id: d0124941cf
[formerly f8a20529d7
] [formerly dd10f6799b
] [formerly d0124941cf
[formerly f8a20529d7
] [formerly dd10f6799b
] [formerly fcacf03de0
[formerly dd10f6799b
[formerly 06158e2d3486770e0aeda370f12e49356d15d440]]]]
Former-commit-id: fcacf03de0
Former-commit-id: 6af53d70a7
[formerly 73588e3289
] [formerly 9543294906c83b93e7f6d2c401190b0148820cb7 [formerly 59990c15cf
]]
Former-commit-id: 49dfe3ccc6580e5930907dc69bdf1ced8fdee91a [formerly 01edd8acd2
]
Former-commit-id: 976c6ac8e2
2013-04-10 15:57:05 -05:00
Nate Jensen
e84f6e3448
Merge "Issue #1896 Make FFMPResource work better with D2D time matcher." into omaha_13.4.1
...
Former-commit-id: f02d3d2d67
[formerly 1825e7a4fc
] [formerly 2e6f8d874e
] [formerly f02d3d2d67
[formerly 1825e7a4fc
] [formerly 2e6f8d874e
] [formerly e6c7729470
[formerly 2e6f8d874e
[formerly db2d869900335634e9976370b7154baad4415ab2]]]]
Former-commit-id: e6c7729470
Former-commit-id: 336ad702de
[formerly 099d6055e1
] [formerly f98ac70d72af6e4ba7d74ca3304afd3ccebed7aa [formerly 9ee54a18f7
]]
Former-commit-id: 3cda992e407887a3811338ec06cd478262520937 [formerly ccae7d873f
]
Former-commit-id: 9c0aab26eb
2013-04-10 14:57:43 -05:00
Dustin Johnson
2f83476702
Merge "Issue #1891 Fix sorting in pending subscription table" into development
...
Former-commit-id: 9c1ad200a7
[formerly 1aec1ca6cd
] [formerly 355e654c1e
] [formerly 9c1ad200a7
[formerly 1aec1ca6cd
] [formerly 355e654c1e
] [formerly d117a40e7c
[formerly 355e654c1e
[formerly f1360b8ef80c343ad16b2345c500ea48c17ba209]]]]
Former-commit-id: d117a40e7c
Former-commit-id: 463df28308
[formerly 9b1a6c153c
] [formerly c299f64e2bf13bd515fb4d370ba5a7f070c600b5 [formerly d149e51484
]]
Former-commit-id: 65cf3447d4cefdcd973fc6e586839b6b0f05b0ca [formerly 66136037bb
]
Former-commit-id: c72a44eb9e
2013-04-10 14:50:14 -05:00
Richard Peter
2f8f73d462
Merge "Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean" into omaha_13.4.1
...
Former-commit-id: 64f626df2f
[formerly 429d562563
] [formerly 060cf5b326
] [formerly 64f626df2f
[formerly 429d562563
] [formerly 060cf5b326
] [formerly a31dec3cc8
[formerly 060cf5b326
[formerly 203a91a2d673329199e9fecc8bf2f171bd524cc2]]]]
Former-commit-id: a31dec3cc8
Former-commit-id: 6d3b5b48a2
[formerly 148776865f
] [formerly 4e6c97c2107840be526d25ac2707d719db6ce7b7 [formerly 558812ff6e
]]
Former-commit-id: 25a86700d5e58db9cf9dd18e483ad9a379a6bdc8 [formerly 70b9220889
]
Former-commit-id: 5279ca8c53
2013-04-10 14:40:36 -05:00
Nate Jensen
1c8a6d0392
Merge "Issue #1786 - Initial checkin of https for thin client Code review comments" into omaha_13.4.1
...
Former-commit-id: 443b6cc400
[formerly c291c9a61d
] [formerly 7ca6107be4
] [formerly 443b6cc400
[formerly c291c9a61d
] [formerly 7ca6107be4
] [formerly f59a8b3d4c
[formerly 7ca6107be4
[formerly b4e2ee48a9ce2f5d751a2b18c0c945f51c162324]]]]
Former-commit-id: f59a8b3d4c
Former-commit-id: f355aab6e3
[formerly 6e0a002fd2
] [formerly 340f2a8b9964165270b1bbafb2342ed38c40ce0e [formerly 891bcbe543
]]
Former-commit-id: c9fd30763f1f5b7f736291ba944f02274e27cf7d [formerly 1f67a67ef5
]
Former-commit-id: 4b8adbeb9a
2013-04-10 14:35:06 -05:00