Benjamin Phillippe
2d719962a7
Issue #1693 Fixing dependencies
...
Change-Id: Id62a593dfa9b3d6c09e998689f199d980dda0ed9
Former-commit-id: de11fc45b9
[formerly eebb355e81
] [formerly 0d8adcade1
] [formerly de11fc45b9
[formerly eebb355e81
] [formerly 0d8adcade1
] [formerly 2f0949aa0a
[formerly 0d8adcade1
[formerly 73c647449e071c9290c7b7fa57e99490960be536]]]]
Former-commit-id: 2f0949aa0a
Former-commit-id: f467102072
[formerly 93b1969f05
] [formerly 89aadc836192621ada769d9a7110d29964dbdcb0 [formerly 1561652425
]]
Former-commit-id: 82f2ec559edb1f478395fe179d58b32e570894fe [formerly b79a414f7d
]
Former-commit-id: c5b3c6b5bb
2013-08-21 16:28:49 -05:00
Richard Peter
06c82e1912
Merge "Issue #1693 Fixing build again" into development
...
Former-commit-id: 9ed917a61d
[formerly 63507ec12c
] [formerly 4c47f74b91
] [formerly 9ed917a61d
[formerly 63507ec12c
] [formerly 4c47f74b91
] [formerly cecd9a88e2
[formerly 4c47f74b91
[formerly e9b7e645b418e855e4ab14ba0c3fa35de545147b]]]]
Former-commit-id: cecd9a88e2
Former-commit-id: 5a64f3d1d0
[formerly 3a866323d0
] [formerly 0eb24aa5f65dec60e12ccdd8754ada6a17f33090 [formerly 9d4f18f978
]]
Former-commit-id: 9bcba592c3659e0e8c2c2a17aa2fa8506d9a4499 [formerly 921c379a28
]
Former-commit-id: 2d67d7724f
2013-08-21 15:56:09 -05:00
Benjamin Phillippe
28f59b2cf2
Issue #1693 Fixing build again
...
Change-Id: I6af71ab102b13a0bc0ecefc794cbdf69742d935f
Former-commit-id: 31c6263f0f
[formerly 078a8b2a98
] [formerly b74eda779e
] [formerly 31c6263f0f
[formerly 078a8b2a98
] [formerly b74eda779e
] [formerly c3308766ee
[formerly b74eda779e
[formerly dbe29fbcec7e9e444113471806f19c83a4b6c5c5]]]]
Former-commit-id: c3308766ee
Former-commit-id: 646ab1c672
[formerly ac289ecc77
] [formerly 6ffad3646de9572c10354d6325f947dc4dbcbad7 [formerly 2ca4a747bf
]]
Former-commit-id: bcbed16a7e0eb81c1bbf44c4a54e6805c1310d8f [formerly bb2f932a87
]
Former-commit-id: 23585c6cfd
2013-08-21 15:55:04 -05:00
Richard Peter
63813860ab
Merge "Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres" into development
...
Former-commit-id: 8a37927e03
[formerly 918413d154
] [formerly 02442e8fba
] [formerly 8a37927e03
[formerly 918413d154
] [formerly 02442e8fba
] [formerly b6ed64f7bc
[formerly 02442e8fba
[formerly 2d79cbb93508d5c7f3a16fc4774c34deaa07923b]]]]
Former-commit-id: b6ed64f7bc
Former-commit-id: 56bf18f310
[formerly 4d00446318
] [formerly 707315a7b11ef526cb2d9e1abb7ee6bf1822651d [formerly 53d8483087
]]
Former-commit-id: 6a9a780f447a006b7d0db4a877cdb354ea3ab3bf [formerly 926e523d61
]
Former-commit-id: 6c0a9a2a3a
2013-08-21 14:18:08 -05:00
Mike Duff
986607e3c3
Issue #1848 - Don't show create shared subscription denied message on create sub when user doesn't have the create shared sub permission
...
Fix for cave startup
Change-Id: Ic5040a0bf89273669cc450370c4d858072df0dd8
Former-commit-id: 0f7e76ca43
[formerly 3797ca9523
] [formerly 77e2d04073
] [formerly 0f7e76ca43
[formerly 3797ca9523
] [formerly 77e2d04073
] [formerly 158b0f8564
[formerly 77e2d04073
[formerly 43a3349eda74743ccbccbef2e04bf80a54beba24]]]]
Former-commit-id: 158b0f8564
Former-commit-id: f991d691dd
[formerly edeb23f8d9
] [formerly d46b73738f4a15ee173ba2660c33b433eaf7284e [formerly 7228b3cf71
]]
Former-commit-id: 326822da770b16c6ea1753b3cb6689ea2bcdae31 [formerly 5a89b10d4b
]
Former-commit-id: 46e8c07f1a
2013-08-21 13:46:55 -05:00
Benjamin Phillippe
3ce6abe6f2
Issue #1693 Fixing dependencies
...
Change-Id: I2e502e5ec97f94c316b534933f69285703b23a7e
Former-commit-id: fe5e7a019b
[formerly 3310adfd0b
] [formerly d7031d9c76
] [formerly fe5e7a019b
[formerly 3310adfd0b
] [formerly d7031d9c76
] [formerly 087159b954
[formerly d7031d9c76
[formerly ab7af11f1a230cca095872751abfe7fb29c4500e]]]]
Former-commit-id: 087159b954
Former-commit-id: 1b76b2b73f
[formerly 345ba9baf0
] [formerly 23ac05754354155c13b2eeda92e083ac5e76ee1c [formerly 384c70d990
]]
Former-commit-id: f7e0cea0a8912ddc8b56db9fc52000083cd8f4bf [formerly a88418d24a
]
Former-commit-id: 9183d53322
2013-08-21 13:32:17 -05:00
Benjamin Phillippe
c833aabc8e
Issue #1693 Fixed plugin dependency
...
Change-Id: I4633ee50d696961d3166203d3a155a9688c62fb6
Former-commit-id: dfaae68b19
[formerly 8c428829eb
] [formerly db9c0af3a6
] [formerly dfaae68b19
[formerly 8c428829eb
] [formerly db9c0af3a6
] [formerly 416419bd27
[formerly db9c0af3a6
[formerly f8cbd960929249c4d711b54699fb7c7d973399f9]]]]
Former-commit-id: 416419bd27
Former-commit-id: 56f991703b
[formerly 088009b83f
] [formerly 4b6ff186b9f572ecdd921eee169612dff6a4af14 [formerly e5d3df9631
]]
Former-commit-id: 785ed21ae2e0e339a1b4042ec85d41af17082f9f [formerly 39cb869886
]
Former-commit-id: 59195e43be
2013-08-21 12:50:57 -05:00
Ron Anderson
11b2e9ae87
Merge "Issue #2280 Fix plugin purging" into development
...
Former-commit-id: 464a3710ba
[formerly ba6c8b4fae
] [formerly 788a181336
] [formerly 464a3710ba
[formerly ba6c8b4fae
] [formerly 788a181336
] [formerly 9ad6ca2c98
[formerly 788a181336
[formerly c52535a68ed4251527e54590319f2a5bf5baea72]]]]
Former-commit-id: 9ad6ca2c98
Former-commit-id: d586fe1031
[formerly d765f460b2
] [formerly 97e528858c7511081ec3834c5ca4d4d0cb7adff9 [formerly 04e6ab0dc3
]]
Former-commit-id: d2bc42b4412609f5c0c46aeb2608e1eb955a2f54 [formerly fd059166c0
]
Former-commit-id: 42007a0ab6
2013-08-21 11:49:17 -05:00
Dave Hladky
492290b7db
Issue #2280 Fix plugin purging
...
Former-commit-id: 4b7500394e
[formerly 1764948e53
] [formerly 35b9b81e86
] [formerly 4b7500394e
[formerly 1764948e53
] [formerly 35b9b81e86
] [formerly 8b80ed7ae1
[formerly 35b9b81e86
[formerly 7678e5a7b42b704ed531197291c1de5a7f2d14de]]]]
Former-commit-id: 8b80ed7ae1
Former-commit-id: 163ad9ea52
[formerly 9aefefa9d0
] [formerly 8832587555032f680142685243825a6ea102717c [formerly c18fa655ff
]]
Former-commit-id: 51dd11cfeedce5e3dcb33636bcccf61e3d9c710d [formerly d0d2efd52f
]
Former-commit-id: 82d7f00fe4
2013-08-21 11:45:25 -05:00
Richard Peter
2e693b1b49
Merge "Issue #2280 Fix plugin purging" into development
...
Former-commit-id: 8e91e1ef7b
[formerly b9e5d6c6b5
] [formerly 317cd3417e
] [formerly 8e91e1ef7b
[formerly b9e5d6c6b5
] [formerly 317cd3417e
] [formerly 38b983f09e
[formerly 317cd3417e
[formerly 17ec421694428d148db6744e288b0b5c44b66aed]]]]
Former-commit-id: 38b983f09e
Former-commit-id: 04ad1d85a9
[formerly d967b6ce7f
] [formerly 791d5cc73e494acf099d6b1c51502c1d3fee678c [formerly 05819e8491
]]
Former-commit-id: b01098c1928f713ed67e147f8079550d7bec94b8 [formerly ed484de618
]
Former-commit-id: b661ec4e9d
2013-08-21 11:29:54 -05:00
Ben Steffensmeier
a9185211ef
Issue #2259 Restore WxMath functionality used by popup skewT.
...
Change-Id: Ibfb2d2fda05ad0f03d8e708e18d2b93b4914e7d2
Former-commit-id: 367dc2b0d9
[formerly 4fd0fb8863
] [formerly d10a32ffa0
] [formerly 367dc2b0d9
[formerly 4fd0fb8863
] [formerly d10a32ffa0
] [formerly 25be2a014c
[formerly d10a32ffa0
[formerly c3aa2c78243afcfa02c0988b16cf6640e35e73dc]]]]
Former-commit-id: 25be2a014c
Former-commit-id: 04359ae0e4
[formerly 1d863558b1
] [formerly 4681e22e05a2186ef0af3afe86baa47cfb8b7feb [formerly 3697dd958a
]]
Former-commit-id: 4d5afe276ada507bef782085e93048c147eccb18 [formerly 20a11ff999
]
Former-commit-id: cab92a16c4
2013-08-21 11:27:50 -05:00
Ben Steffensmeier
f52227c6b8
Issue #2259 Delete old skewt plugin.
...
Change-Id: I41bd0e2268c5024ea88215683c4ecb12530ebd0d
Former-commit-id: 7da738187f
[formerly d28018c5ce
] [formerly e66bf7ce93
] [formerly 7da738187f
[formerly d28018c5ce
] [formerly e66bf7ce93
] [formerly 3741068984
[formerly e66bf7ce93
[formerly 6f28d04b100001530afd17df69b87a6ac5a6407d]]]]
Former-commit-id: 3741068984
Former-commit-id: 160e4211fe
[formerly 3679a4526c
] [formerly ea81fa29a5c9a06d39f8e17d8fd3492521c9f46b [formerly 8eaa12c9db
]]
Former-commit-id: e7af550782d5185a69f4d4c97ab2de926a76d60c [formerly 796b2e8e6c
]
Former-commit-id: a148790927
2013-08-20 17:57:06 -05:00
Ron Anderson
dc714d7260
Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres
...
Change-Id: Iae7cf49fc18abf03ef3b0ee498fb8e658f37d1cf
Former-commit-id: 3de94947e0
[formerly 3fd2f523d9
] [formerly 04d2fdc214
] [formerly 3de94947e0
[formerly 3fd2f523d9
] [formerly 04d2fdc214
] [formerly 5aee6f35ff
[formerly 04d2fdc214
[formerly 3094dc247a6de94ff00321d093b431e3f401b0c5]]]]
Former-commit-id: 5aee6f35ff
Former-commit-id: c17e493249
[formerly 06cbd815be
] [formerly 288c866bff4b051e23f64443aa754d46ba800e69 [formerly f0fb2391af
]]
Former-commit-id: 0a37062489f09181fd87da2090b4049989f9632f [formerly ddf03d171e
]
Former-commit-id: 7928912dc5
2013-08-20 17:16:21 -05:00
Dave Hladky
de289f4e0c
Issue #2280 Fix plugin purging
...
Former-commit-id: 60f1e78650
[formerly 6aabf969a8
] [formerly b0eeafe7d4
] [formerly 60f1e78650
[formerly 6aabf969a8
] [formerly b0eeafe7d4
] [formerly 4a10a699a9
[formerly b0eeafe7d4
[formerly 12aa32056e70d27aee62935ed7057812bd8107ef]]]]
Former-commit-id: 4a10a699a9
Former-commit-id: 84539edfcf
[formerly 43dd1e18c2
] [formerly a807aa07ca215af3991749568d459860cba64732 [formerly cf922cdefa
]]
Former-commit-id: 0e7d6c5cd4b5af8c6263eb3942e336c0a26b819f [formerly c1c58dba44
]
Former-commit-id: 39208cdcaa
2013-08-20 16:18:23 -05:00
Nate Jensen
97f0f548b1
Merge "Issue #2250 resolve some ffmp data factory issues and make some changes to failing function calls in FFMP, and handle new types of objects in JUtil" into development
...
Former-commit-id: c77944ebf9
[formerly 783b7d151f
] [formerly 8d01eefc50
] [formerly c77944ebf9
[formerly 783b7d151f
] [formerly 8d01eefc50
] [formerly 6941e3300b
[formerly 8d01eefc50
[formerly 811924693ef44e87aae65a33c8decd1a7f1cd321]]]]
Former-commit-id: 6941e3300b
Former-commit-id: 0401d0a7e4
[formerly 4de49cde5a
] [formerly b8571d4f62a6d7bb65ed8d2de800f4c718290db7 [formerly 599642edf5
]]
Former-commit-id: c4c13616d93d0f092d05b213c5901f5d1b5c56f6 [formerly 81d07dfaf6
]
Former-commit-id: 469e5ff090
2013-08-20 14:49:24 -05:00
Ben Steffensmeier
0e7410af64
Issue #2194 Fix site override.
...
Former-commit-id: 85c71b7714
[formerly de00b302b3
] [formerly 791c6a9890
] [formerly 85c71b7714
[formerly de00b302b3
] [formerly 791c6a9890
] [formerly dac718634c
[formerly 791c6a9890
[formerly faba58780d497f8db564c0fa325c07b35326e010]]]]
Former-commit-id: dac718634c
Former-commit-id: f558d240ba
[formerly e757a184e1
] [formerly 1d5ea6677cdb2f75d1fabaa5d51f91e64314f0f3 [formerly 4e218e9e56
]]
Former-commit-id: a02dba3599b3b1b5adf9600921abcccfccb91510 [formerly 7bf35bdac6
]
Former-commit-id: 48ac0e726d
2013-08-20 14:47:32 -05:00
Matt Nash
95074d44ca
Issue #2250 resolve some ffmp data factory issues and make some changes to failing function calls in FFMP, and handle new types of objects in JUtil
...
Change-Id: If6b33d542e2a0c2744e6c906d98273f589694772
Former-commit-id: cf970e11ea
[formerly c2da9a7152
] [formerly 4c8e631e22
] [formerly cf970e11ea
[formerly c2da9a7152
] [formerly 4c8e631e22
] [formerly 304ef3e3b8
[formerly 4c8e631e22
[formerly 8916efbaad066e1b5dc6d01b68fa67c72ebc982b]]]]
Former-commit-id: 304ef3e3b8
Former-commit-id: ea6a00398f
[formerly d7a87afa96
] [formerly df4d2b3c7f7f83d412274f6be61ebe5b08f0dff3 [formerly b2b6246ead
]]
Former-commit-id: 1031ea9cdc1f8df6e7b78bd91a2cc25ff14a981a [formerly e345fbaa6b
]
Former-commit-id: 6b00110403
2013-08-20 12:10:19 -05:00
Roger Ferrel
d4dedada08
Issue #2220 Better response using priority queues and delay getting display data.
...
Change-Id: I5f7b8eb904dcde9ef52acc2f39df864ac62080bb
Former-commit-id: b9bf2ab9b7
[formerly 73cc41435b
] [formerly 23bfd136b2
] [formerly b9bf2ab9b7
[formerly 73cc41435b
] [formerly 23bfd136b2
] [formerly c626f25565
[formerly 23bfd136b2
[formerly 41b9f80efe66151a16b0df5b74ccc2904ac19e20]]]]
Former-commit-id: c626f25565
Former-commit-id: 6fb558b74b
[formerly 7d97beec44
] [formerly c072ef91f16d6f97d00a8d53a1b34beec38c5335 [formerly 62563c8b7b
]]
Former-commit-id: 4b8b8a8fbbc6c4e3624798fa62d9bca0f520c527 [formerly 6f9c9d752d
]
Former-commit-id: 101fc37ef7
2013-08-20 11:55:19 -05:00
Richard Peter
2d2c848668
Merge "Issue #2196 Renamed ncfRegistry.sh to centralRegistry.sh and wfoRegistry.sh to registry.sh to correspend to the modes.xml names." into development
...
Former-commit-id: afbf699586
[formerly f623053d18
] [formerly 02131eecb0
] [formerly afbf699586
[formerly f623053d18
] [formerly 02131eecb0
] [formerly 36c486ca0a
[formerly 02131eecb0
[formerly 4003a61f0b6ea56f31dcf6cf1be7ee16f70860be]]]]
Former-commit-id: 36c486ca0a
Former-commit-id: 8b8959510e
[formerly d0c5729abc
] [formerly dec2197b6f71ff5fba93a5326ecfee1870a32c21 [formerly 83eaf3f5fc
]]
Former-commit-id: 72e4d516cd443e3f6cf7cb3261b3b8e8b70bb79c [formerly b258da63c1
]
Former-commit-id: 513398be67
2013-08-20 11:37:28 -05:00
Richard Peter
c513d673fb
Merge "Issue #1692 Implemented/Verified Registry LifecycleManager - Verified submitObjects protocol - Added unimplemented features of removeObjects protocol - Implemented updateObjects protocol - Refactored registry error reporting - Fixed JUnit tests - Corrected @XmlRootElement tag on registry objects - Added capability to modify registry objects using XPath" into development
...
Former-commit-id: 8bfce05bc8
[formerly 4a581efbc5
] [formerly 544504b029
] [formerly 8bfce05bc8
[formerly 4a581efbc5
] [formerly 544504b029
] [formerly afc8e8823f
[formerly 544504b029
[formerly 95d945ad9fdfaf4a18d2fb6d9dd63b1314e95c8c]]]]
Former-commit-id: afc8e8823f
Former-commit-id: fc14b3c33d
[formerly 82239ba26f
] [formerly 84b714c8157bb59dd7404ce6786e9f26cbc5bc14 [formerly 194604aa24
]]
Former-commit-id: 762cf41606cb3ed6421f478e56e759776f3dcf5f [formerly 3459527089
]
Former-commit-id: abb479c601
2013-08-20 11:02:43 -05:00
Richard Peter
2a3e39776a
Merge "Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent." into development
...
Former-commit-id: 78c4b99f96
[formerly 907ba11370
] [formerly 3f68e90b92
] [formerly 78c4b99f96
[formerly 907ba11370
] [formerly 3f68e90b92
] [formerly fed1365d50
[formerly 3f68e90b92
[formerly d18c660b2b9d1f9c679118ca46be45c69d76aea7]]]]
Former-commit-id: fed1365d50
Former-commit-id: 115e4fba92
[formerly 15f4bda876
] [formerly 8865a2769a423b07a46c1d515ba69f5cdc297eab [formerly 75bdec15f2
]]
Former-commit-id: 90b5d11015542bc74a98851d78ffacee596289d0 [formerly 3443f1803b
]
Former-commit-id: 578e2cab2e
2013-08-20 11:01:05 -05:00
Brad Gonzales
1487063252
Issue #2196 Renamed ncfRegistry.sh to centralRegistry.sh and wfoRegistry.sh
...
to registry.sh to correspend to the modes.xml names.
Change-Id: Ia07b046016e522089002440b4162de8370ee5343
Former-commit-id: 2d3426d9c7
[formerly 1c117e1ace
] [formerly 6a98f66353
] [formerly 2d3426d9c7
[formerly 1c117e1ace
] [formerly 6a98f66353
] [formerly 6f7eb373d4
[formerly 6a98f66353
[formerly 17f72768dbee4239238c77d21a35a07c21824e88]]]]
Former-commit-id: 6f7eb373d4
Former-commit-id: f37dceacf0
[formerly 0b9acdf944
] [formerly f3fd2c89c2b1032a1e52d05c547c81839d848716 [formerly aa63997a17
]]
Former-commit-id: e29e1c6c568b008e9e0281abd37db9aa5fa1b3b9 [formerly a714dc6aba
]
Former-commit-id: fc886acb52
2013-08-19 16:56:09 -05:00
Ben Steffensmeier
ab2e5885a4
Issue #2275 Add dataURI column back into bufrmos types.
...
Former-commit-id: c444a0c4ba
[formerly d6ab7d08be
] [formerly 4cb853ac39
] [formerly c444a0c4ba
[formerly d6ab7d08be
] [formerly 4cb853ac39
] [formerly 9219db0069
[formerly 4cb853ac39
[formerly 1b883da972ac915252c256b63c881d23121f3ac6]]]]
Former-commit-id: 9219db0069
Former-commit-id: fbf165f37f
[formerly 3a8893846f
] [formerly ababd150fc882dda0dca13854e3bf316e1aafa9b [formerly 8b9031719a
]]
Former-commit-id: 620c37f476535c8ffd732b686b071649639a0a93 [formerly 7668fdbde7
]
Former-commit-id: 02d3f28c06
2013-08-19 16:00:01 -05:00
Steve Harris
7a291e0bfb
13.5.1-17 baseline
...
Former-commit-id: fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly b210c90245
[formerly 9dd7dc5d20
[formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]]
Former-commit-id: b210c90245
Former-commit-id: 4fd4093539
[formerly 7c0cf13ea8
] [formerly c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1
]]
Former-commit-id: 27a8a42f514b9659d14772e48ae0d9cff9703709 [formerly 815bfe575c
]
Former-commit-id: 4bcb06cd63
2013-08-19 16:34:24 -04:00
Lee Venable
54a17b1440
Merge "Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog Peer review comments" into development
...
Former-commit-id: f666a24c75
[formerly 23dca45a0c
] [formerly b8d050a172
] [formerly f666a24c75
[formerly 23dca45a0c
] [formerly b8d050a172
] [formerly 6f1e633d57
[formerly b8d050a172
[formerly cb230698c8be8faef2441171f2270e41807f797d]]]]
Former-commit-id: 6f1e633d57
Former-commit-id: 18b63c6cff
[formerly a4cb2d6d21
] [formerly 3973cbe4b9deebe7fb069043bda07496e2099871 [formerly e1b9d4cf81
]]
Former-commit-id: 0518c04fb6a7c077bdc86951cfd07a70a5a4d0b5 [formerly cd7b1fdc0a
]
Former-commit-id: 71aa6f514f
2013-08-19 15:14:22 -05:00
Benjamin Phillippe
93c568ae2f
Issue #1692 Implemented/Verified Registry LifecycleManager
...
- Verified submitObjects protocol
- Added unimplemented features of removeObjects protocol
- Implemented updateObjects protocol
- Refactored registry error reporting
- Fixed JUnit tests
- Corrected @XmlRootElement tag on registry objects
- Added capability to modify registry objects using XPath
Change-Id: Id8eea47c3c4a1e39fe88cb17530e9e6cdacd7ce2
Former-commit-id: afddfc35e5
[formerly fcd42b5869
] [formerly 2403f75262
] [formerly afddfc35e5
[formerly fcd42b5869
] [formerly 2403f75262
] [formerly 1390bd8a65
[formerly 2403f75262
[formerly 94810246b449c64457c48684df72baf6e9e8b03d]]]]
Former-commit-id: 1390bd8a65
Former-commit-id: 8dc4f54610
[formerly d98fbd79c7
] [formerly 79784b1b6e6437fbfc1c16e804a6e73a6d884797 [formerly d9dffafa6f
]]
Former-commit-id: e1e494fc9d2bf4c719b2188bea2742729fa1bade [formerly f2889110a7
]
Former-commit-id: ea6d316023
2013-08-19 13:16:13 -05:00
Bryan Kowal
e20a010a87
Issue #2169 - gzip data uris; entities that receive data uris will unzip them before running thrift conversions.
...
- Amend: updates for 32-bit edex_com
- Amend: do not synchronize when building the message
- Amend: use the byte array pool
- Amend: default to data decompression when the queue is edex.alerts
Change-Id: I79a1f3d3d698c67019a4aa33e667fef99f6ebc17
Former-commit-id: 35cacacc45
[formerly 7e61461e86
] [formerly 3eaacdb522
] [formerly 35cacacc45
[formerly 7e61461e86
] [formerly 3eaacdb522
] [formerly 2e1a8eb2b3
[formerly 3eaacdb522
[formerly 120aa0d6ee671e20734f8efb7bad89ff1b145629]]]]
Former-commit-id: 2e1a8eb2b3
Former-commit-id: 99e3667a78
[formerly 18c9026455
] [formerly f55be8607a629311fb3cfbbd46fe9a4e8526f65a [formerly 5c0af47d6d
]]
Former-commit-id: f9a946547f135e389ffc3cb81539eba2b10848cc [formerly 6f246409fd
]
Former-commit-id: 7bcb1f4407
2013-08-19 12:06:30 -05:00
Richard Peter
bc660b4352
Merge "Issue #1742 Fixed concurrent mod exception in DAT config updates Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e" into development
...
Former-commit-id: 531fa21a9c
[formerly fd4e8b931c
] [formerly e5b6102791
] [formerly 531fa21a9c
[formerly fd4e8b931c
] [formerly e5b6102791
] [formerly 39a56abb39
[formerly e5b6102791
[formerly 7988827cf78516d2b928db9004cec0ab5bebd08e]]]]
Former-commit-id: 39a56abb39
Former-commit-id: 4d01748097
[formerly cdc82ab15f
] [formerly a2323adbe5d1fc9877caa9023a75acaa597ae213 [formerly 2258c4cee1
]]
Former-commit-id: a729aacb8f7fc998c3d462dbe5b9e9283780f1a5 [formerly c15214630c
]
Former-commit-id: 3aa7b22c17
2013-08-19 10:10:38 -05:00
Dave Hladky
9b5d7d4119
Issue #1742 Fixed concurrent mod exception in DAT config updates
...
Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e
Former-commit-id: 1072e7760e
[formerly c25937ec85
] [formerly 111ffab3c9
] [formerly 1072e7760e
[formerly c25937ec85
] [formerly 111ffab3c9
] [formerly 6d9872d694
[formerly 111ffab3c9
[formerly 8f3cbb79c086845d49b7a877359cac3f83fc1c1c]]]]
Former-commit-id: 6d9872d694
Former-commit-id: 1aae775e7e
[formerly d290c84290
] [formerly d8004af680ebf95d68aa96730d6ee5f26937c6f4 [formerly 2702279e7a
]]
Former-commit-id: 181d02f8f348d7326491fdbc618f9b0bb29da64c [formerly a7de983a1c
]
Former-commit-id: c16bb222de
2013-08-16 16:26:19 -05:00
Mike Duff
e67de50fae
Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog
...
Peer review comments
Change-Id: I4b2eef5a0d0697e2f94aa7c59872c73cb3b350b0
Former-commit-id: e0ddf25ffb
[formerly 89cdc61d65
] [formerly 70af70ba8d
] [formerly e0ddf25ffb
[formerly 89cdc61d65
] [formerly 70af70ba8d
] [formerly 6190281e77
[formerly 70af70ba8d
[formerly 938c6d3151fc5b7513ee48fe9e9de0c60e7799a8]]]]
Former-commit-id: 6190281e77
Former-commit-id: a6241aa1f7
[formerly 8d27c7b420
] [formerly d87f78a39b53d661f4c977717f1277c1b9e92059 [formerly c4c73b4e3b
]]
Former-commit-id: c8c31d7dd3d6a04d0e4a3c70edcc2485fc1b0680 [formerly f22684b90b
]
Former-commit-id: e33069668b
2013-08-16 13:13:02 -05:00
Everett Kladstrup
b04c00446e
Issue #2240 Fix incorrect environment assumptions
...
* using $awips_home as the prefix for java/python/psql causes
problems on edex-environment (wes2bridge) installs; where
$awips_home does not contain the java/python/psql installs, instead
they are located at /awips2
Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee
Former-commit-id: 07f18003f1
[formerly 2803eded49
] [formerly 535248b69b
] [formerly 07f18003f1
[formerly 2803eded49
] [formerly 535248b69b
] [formerly fba53e9fe3
[formerly 535248b69b
[formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f]]]]
Former-commit-id: fba53e9fe3
Former-commit-id: 38a8d8268f
[formerly b602d37357
] [formerly 0dd804a51c987294808ac793df221d81414a3689 [formerly 6883cdc389
]]
Former-commit-id: 66a7cbb8f8a1b79dd97f3b32a6e6dc557e9297f9 [formerly 08bbf8620a
]
Former-commit-id: eb14f5a5fe
2013-08-16 11:02:15 -05:00
Nate Jensen
06f7412df3
Merge "Issue #2260 Switch poessounding to NSharp. Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78" into development
...
Former-commit-id: 5b2e7006b6
[formerly f5e84f17ea
] [formerly 469df6d806
] [formerly 5b2e7006b6
[formerly f5e84f17ea
] [formerly 469df6d806
] [formerly d28cb1ff68
[formerly 469df6d806
[formerly 2f69b0b239a292711ed6b40a1348d357f65bdc67]]]]
Former-commit-id: d28cb1ff68
Former-commit-id: 6d6c0d121b
[formerly 8f6f749c60
] [formerly c43551d6dbc778aac9cbe8d81d942096567b5381 [formerly b34d67ced3
]]
Former-commit-id: 37904f943851d5fcb5276b047aa592b2601d92f9 [formerly bca8f9f3ca
]
Former-commit-id: 7710ab9c0e
2013-08-16 10:06:32 -05:00
Richard Peter
a88c9938ca
Merge "Issue #2196 final name change for registries. Now registry and centralRegistry." into development
...
Former-commit-id: 2ca642e7d9
[formerly bbde1db7a0
] [formerly ae1d4ca6b4
] [formerly 2ca642e7d9
[formerly bbde1db7a0
] [formerly ae1d4ca6b4
] [formerly ea98de5ad1
[formerly ae1d4ca6b4
[formerly e9dc49bfac807b7ddbe2a6ac39e13eb917aacf44]]]]
Former-commit-id: ea98de5ad1
Former-commit-id: bcdd57509a
[formerly 6bb8ae2dda
] [formerly 1989be5a9390d6ebd6e2683037b40396ddb99110 [formerly 8f12009352
]]
Former-commit-id: 9819abbc296fa19fda138ba9104e49f6fb50a390 [formerly b8bf91e9af
]
Former-commit-id: dd7b4a4705
2013-08-16 09:41:08 -05:00
Ben Steffensmeier
77f32fb76b
Issue #2260 Switch poessounding to NSharp.
...
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78
Former-commit-id: 63604dad27
[formerly fb23de355e
] [formerly 36a920333f
] [formerly 63604dad27
[formerly fb23de355e
] [formerly 36a920333f
] [formerly 74b0b57f4b
[formerly 36a920333f
[formerly 4e83b721a46cea5af56fd2444ba4bf22813604e9]]]]
Former-commit-id: 74b0b57f4b
Former-commit-id: 644b43649a
[formerly ad82565d1a
] [formerly 2dc426002f0ac501f60be71e2c0a10436e7cf8c8 [formerly 94e79ff7b4
]]
Former-commit-id: 9bc206b592db7f0de1665d22e70fbdd6ba607733 [formerly e24647553f
]
Former-commit-id: d9932b5ce1
2013-08-15 17:51:52 -05:00
Max Schenkelberg
dad1bc51a5
Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
...
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611
Former-commit-id: f8e36bea6f
[formerly a6a44754c9
] [formerly 57a0df81a6
] [formerly f8e36bea6f
[formerly a6a44754c9
] [formerly 57a0df81a6
] [formerly 9e213438f4
[formerly 57a0df81a6
[formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]]]
Former-commit-id: 9e213438f4
Former-commit-id: 53d4c9d9c2
[formerly 0703b5c772
] [formerly e195d4590671cefaed22b31ff4f8a803d2f88877 [formerly b67a3033f9
]]
Former-commit-id: 6ccb9209bae79b1c80076aabe8abaa3e4393a959 [formerly f720f78f4c
]
Former-commit-id: 16232ee8c7
2013-08-15 17:36:36 -05:00
Max Schenkelberg
b64a9336a9
Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
...
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7
Former-commit-id: 54b4b759fd
[formerly 5a4d880498
] [formerly e85d66f4e5
] [formerly 54b4b759fd
[formerly 5a4d880498
] [formerly e85d66f4e5
] [formerly 3800aec9e6
[formerly e85d66f4e5
[formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]]
Former-commit-id: 3800aec9e6
Former-commit-id: 39cdbf728f
[formerly 352e21ffd3
] [formerly ac74cfea7295b7cc3576674f8b131a9d316f9718 [formerly d89d13d029
]]
Former-commit-id: 1f274d37e697e17bfbf5f890a9373463aff7810c [formerly ee68615786
]
Former-commit-id: 6709242e36
2013-08-15 15:50:40 -05:00
Brad Gonzales
d622dc327d
Issue #2196 final name change for registries. Now registry and centralRegistry.
...
Change-Id: I172aa9918c2281fa2923503eeb067954e4bf955f
Former-commit-id: 7cf7c73053
[formerly 18956d5816
] [formerly 2279d03112
] [formerly 7cf7c73053
[formerly 18956d5816
] [formerly 2279d03112
] [formerly 705d4660cc
[formerly 2279d03112
[formerly f5a61ca98bc2da6bb69ef6f78fe40e390bfab45f]]]]
Former-commit-id: 705d4660cc
Former-commit-id: 32a2f9cff4
[formerly 48cc348080
] [formerly 8eaf9ba357094cfe61c11d3c50bbdda77fcde437 [formerly cf77bb12b7
]]
Former-commit-id: 7a23b5b5305710d783d1778f61b8242b10d72fc8 [formerly 9c63e17a83
]
Former-commit-id: 223a52eece
2013-08-15 14:57:53 -05:00
Max Schenkelberg
3c02342d04
Issue #2033 moved avnfps and text workstation files into respective plugins.
...
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2
Former-commit-id: db24201469
[formerly bbad83c21a
] [formerly 6f60751ec6
] [formerly db24201469
[formerly bbad83c21a
] [formerly 6f60751ec6
] [formerly c5575f9624
[formerly 6f60751ec6
[formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]]
Former-commit-id: c5575f9624
Former-commit-id: 62f4f1bafb
[formerly 8139e0dfb7
] [formerly 33159773a1764cd4fb517d13a3cff0a11feaa433 [formerly 8de539020d
]]
Former-commit-id: 094fceec6e1d9989f5e80a4efe1310f8a093b3ef [formerly 451eb54a36
]
Former-commit-id: f553c93092
2013-08-15 12:21:43 -05:00
Ben Steffensmeier
6e3635d147
Issue #2259 fix units for goes point data pressure
...
Former-commit-id: 91df4581d2
[formerly d3628766b8
] [formerly 2171c10e9e
] [formerly 91df4581d2
[formerly d3628766b8
] [formerly 2171c10e9e
] [formerly 984c5f2684
[formerly 2171c10e9e
[formerly 411c30dc9a5396ade5af03294cad612472e8060b]]]]
Former-commit-id: 984c5f2684
Former-commit-id: 15a295ca05
[formerly 7070a2bd18
] [formerly 430e4cc00c7532c4d09b1b5178c1c9a413e1a952 [formerly fff0ce30ae
]]
Former-commit-id: 42a91fc280b2738b832787ba3922d2183e954dde [formerly 5a6ad9b554
]
Former-commit-id: 1ffc606115
2013-08-15 12:02:24 -05:00
David Gillingham
2e5e666153
Issue #2262 : Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
...
Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: bd9b224ff5
[formerly c17f8b4409
] [formerly 0b6b0e06cc
] [formerly bd9b224ff5
[formerly c17f8b4409
] [formerly 0b6b0e06cc
] [formerly 40b5d54bf3
[formerly 0b6b0e06cc
[formerly 5992197809236553e9c021526e42d28ed327b413]]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 218ec39696
[formerly 9c656c28b9
] [formerly 677ad3a406560b6ea868401e4fe7be87a4817e25 [formerly 8d347252d2
]]
Former-commit-id: c1a7c1d2b9b5f35177db262289e7dc470702f3ad [formerly f46f62ff2e
]
Former-commit-id: a217ce6044
2013-08-15 11:30:45 -05:00
Brad Gonzales
4c0486fe6a
Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent.
...
Amend: Added constructor to RegistryStatisticsEvent that takes a count parameter
and other recommendations from peer review. Removed count attribute
from RegistryStatisticsEvent. Changed construction of SubsriptionRequestEvents
to set numRecords attribute.
Change-Id: Ib7595b9098299aedeae9db0ca02250551848c3e2
Former-commit-id: edbea8c515
[formerly e4251ad380
] [formerly d2dac35b65
] [formerly edbea8c515
[formerly e4251ad380
] [formerly d2dac35b65
] [formerly 64c6e5abff
[formerly d2dac35b65
[formerly 818688266a32feec2081f0c6e74a37e431df9435]]]]
Former-commit-id: 64c6e5abff
Former-commit-id: 278d98e214
[formerly fa4e8d9897
] [formerly 974ed273b70311d9cd1f9f764733500330fab491 [formerly 84e14a5a62
]]
Former-commit-id: 6c54b71951c093498c34a0c510163341d426c429 [formerly 4d4f281553
]
Former-commit-id: 04f9dfb84a
2013-08-15 09:35:10 -05:00
Richard Peter
7775ed3e03
Issue #2214 : Fix merge issue with gfe-spring.xml
...
Former-commit-id: e5cb3f9e0a
[formerly 2064be203d
] [formerly eb8805e51c
] [formerly e5cb3f9e0a
[formerly 2064be203d
] [formerly eb8805e51c
] [formerly dad1b6fb45
[formerly eb8805e51c
[formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]]]
Former-commit-id: dad1b6fb45
Former-commit-id: 24f8756c64
[formerly bbe1002d2d
] [formerly cb3e15e4ac897a4a2e865c445de30e1e35aa445f [formerly c799d73430
]]
Former-commit-id: 30a7e16fcc217a4db3ce6d7a8d94a5a6e0494a27 [formerly b09a191bfc
]
Former-commit-id: c27aa3bd98
2013-08-14 18:32:39 -05:00
David Gillingham
982d19d1cf
Issue #2009 : Implement dual-domain GFE export_grids solution. Update MHS
...
emulator program to support new directory structure and some code cleanup and
refactoring.
Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d
Former-commit-id: 31ae04c92a
[formerly 1d3f3da9cc
] [formerly 0f4f24beb8
] [formerly 31ae04c92a
[formerly 1d3f3da9cc
] [formerly 0f4f24beb8
] [formerly f8b6ec20c1
[formerly 0f4f24beb8
[formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 5205fe56a7
[formerly 3af47effc5
] [formerly 2eb604c37ee47829cda515d4a57729d8b240989d [formerly 751188ab5a
]]
Former-commit-id: b6b4ffccf0253f44efcf7208a528d5943d4e677e [formerly 4bd40cd544
]
Former-commit-id: a2a4d1fbcf
2013-08-14 17:10:04 -05:00
Richard Peter
e6a36eb12a
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: 181df35afc
[formerly 1f32ef9c7a
] [formerly 5e5047cc4f
] [formerly 181df35afc
[formerly 1f32ef9c7a
] [formerly 5e5047cc4f
] [formerly 2a9276c728
[formerly 5e5047cc4f
[formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]
Former-commit-id: 2a9276c728
Former-commit-id: 84bef1f2ec
[formerly c0b0eef331
] [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f
]]
Former-commit-id: 45b98e41300d826058702743e6eeb0852aa1ad89 [formerly 9cf5e247ab
]
Former-commit-id: 42c78326f1
2013-08-14 15:23:18 -05:00
Richard Peter
f48818579c
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9ff9054d7e
[formerly 2608dfe1d8
] [formerly c61afa1bfa
] [formerly 9ff9054d7e
[formerly 2608dfe1d8
] [formerly c61afa1bfa
] [formerly ee6b9eb11a
[formerly c61afa1bfa
[formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 28a53c8a33
[formerly 3f65eaf74b
] [formerly 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080
]]
Former-commit-id: 7b21c6b410610be2392c1ea462eebd5eaebc5a75 [formerly 7ca1edf371
]
Former-commit-id: a7075027be
2013-08-14 14:29:55 -05:00
Brad Gonzales
435ed0e32d
Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for.
...
Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode.
Change-Id: I8793b2a5c6ebf0f2ce342103e81d48de1b3e2044
Former-commit-id: ec3646def6
[formerly 50a10b3efb
] [formerly 533deffd53
] [formerly ec3646def6
[formerly 50a10b3efb
] [formerly 533deffd53
] [formerly 5d169e4df1
[formerly 533deffd53
[formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]]]
Former-commit-id: 5d169e4df1
Former-commit-id: bd8a061ef4
[formerly 88fdc1e56b
] [formerly 6534d32bcc0af9a21a9c40a2ef91bb08b973dcca [formerly f3bc3d9185
]]
Former-commit-id: 3c378820641428aae469fe6519545209aa8c3cf4 [formerly 526c244fc5
]
Former-commit-id: 490b772aaf
2013-08-14 12:35:18 -05:00
Roger Ferrel
dea3a105dc
Issue #2224 Bug fixes to pass unit test.
...
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00
Former-commit-id: d3a33f2855
[formerly 81a31214cd
] [formerly caa97d7d09
] [formerly d3a33f2855
[formerly 81a31214cd
] [formerly caa97d7d09
] [formerly 87f9cb2fb3
[formerly caa97d7d09
[formerly ca2bb73e1fd77bc289a106eb7743ee5344be3a52]]]]
Former-commit-id: 87f9cb2fb3
Former-commit-id: 8daa627e56
[formerly 87ca79b294
] [formerly f7dc5f884640b503af95dd11719fbe5689844939 [formerly 5be73428f0
]]
Former-commit-id: 7115e4fd7f944cfea7961517975e209d1ee7ab05 [formerly 39239f4005
]
Former-commit-id: 0760fb70e2
2013-08-14 10:25:49 -05:00
Steve Harris
a700182250
13.5.1-15 baseline
...
Former-commit-id: b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly c6dc1817e7
[formerly 53e96e21db
[formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 6f1b6d494f
[formerly 4f9288e7c1
] [formerly c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58
]]
Former-commit-id: 813df6d93357ffbcdd78c9658dc75c9aaa803d60 [formerly 9ea3f0c215
]
Former-commit-id: d0be6956e9
2013-08-14 10:24:26 -04:00
Nate Jensen
28f3475d8a
Issue #2262 create new wxmath plugin seeded by Java derivparam functions
...
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2
Former-commit-id: 9df41ff246
[formerly 23fe237b7e
] [formerly 09872d6713
] [formerly 9df41ff246
[formerly 23fe237b7e
] [formerly 09872d6713
] [formerly 959b50d184
[formerly 09872d6713
[formerly f3d233aeff8017c521288affd4b5be668c9a890a]]]]
Former-commit-id: 959b50d184
Former-commit-id: dde8a77452
[formerly aaee338f5c
] [formerly 51c4ef63ff05fff6b408532bd09a5c1ae80588a3 [formerly 44ef756627
]]
Former-commit-id: e365f2b72b6587537eecf35e48ae9b815f253b51 [formerly 5a2c7fd36f
]
Former-commit-id: 2bed514c66
2013-08-13 16:59:57 -05:00
Nate Jensen
a5552abef2
Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
...
Former-commit-id: ee45599b10
[formerly b435eba010
] [formerly f8d8e312f3
] [formerly ee45599b10
[formerly b435eba010
] [formerly f8d8e312f3
] [formerly d995e29afe
[formerly f8d8e312f3
[formerly 32053b62812fc375aebb5af21af1149b2b4944c5]]]]
Former-commit-id: d995e29afe
Former-commit-id: 98b8bcaf15
[formerly f8a839a0a1
] [formerly d45c592549b4132053bd6601c4ebc9e98574f455 [formerly 759348ba2e
]]
Former-commit-id: ae3a0ab1500ef0f94e532c7a09187a789dd9d3da [formerly 087658d413
]
Former-commit-id: 76773c9b82
2013-08-13 12:34:44 -05:00