Richard Peter
4af4e587e8
Merge "Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes." into development
...
Former-commit-id: d0746350d7
[formerly 1a4c887b6f
] [formerly 42248850a6
] [formerly d0746350d7
[formerly 1a4c887b6f
] [formerly 42248850a6
] [formerly 6223ee42de
[formerly 42248850a6
[formerly d85dd6c0b1c657bc2ff23c461370fbc480656229]]]]
Former-commit-id: 6223ee42de
Former-commit-id: 08f6dae69f
[formerly 5b3944835a
] [formerly 64a9689355af15f6e09574ae0fe2b065b687f3bb [formerly eb0e4c9a70
]]
Former-commit-id: 664a5212e6f7f164b2d48097c1978b5dadbdd3a0 [formerly 0e0b92003b
]
Former-commit-id: c50dee200f
2013-07-31 13:40:49 -05:00
Richard Peter
be84d709e4
Merge branch 'omaha_13.5.1' (13.5.1-8) into development
...
Conflicts:
RadarServer/build.rcm/build.xml
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java
Former-commit-id: e439ecafe6
[formerly 464352f731
] [formerly 26df62db53
] [formerly e439ecafe6
[formerly 464352f731
] [formerly 26df62db53
] [formerly f97a27796d
[formerly 26df62db53
[formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]]
Former-commit-id: f97a27796d
Former-commit-id: 7f46fbf78f
[formerly a67f0bf2da
] [formerly ea1df038b44fa6b4c0db240a0fb0b45969d773c0 [formerly 3f1e17765a
]]
Former-commit-id: 9973bf82bd2bdd62c09a917e8fc0870c0a2147d1 [formerly 5314b90720
]
Former-commit-id: 33d4f95c3e
2013-07-31 12:54:12 -05:00
Richard Peter
3683cf43de
Merge "Issue #2180 encrypt credential storage" into development
...
Former-commit-id: 0c1b56e59c
[formerly 9a7d566375
] [formerly d97920b3dd
] [formerly 0c1b56e59c
[formerly 9a7d566375
] [formerly d97920b3dd
] [formerly 85e1ff2f90
[formerly d97920b3dd
[formerly ff2282377e18aee855e3029c82c6653cf3f4c9e5]]]]
Former-commit-id: 85e1ff2f90
Former-commit-id: 79f686a303
[formerly c0f4788d5a
] [formerly 964a0a8c2be8bab43e777cb05c0ab7790260aaa8 [formerly 8e14c9cd78
]]
Former-commit-id: a73fdbb8d735888a3b84ab53ba633af52abc0534 [formerly ec2eb7feee
]
Former-commit-id: 1f419a0ca4
2013-07-31 11:40:22 -05:00
Richard Peter
8f8da04e54
Merge changes Ibb67b53b,I376f2970,Ie4dee73b into development
...
* changes:
Issue #2227 Fix issue with swapping of melting layer product.
Issue #1726 add swt to unit tests project for use when we need it
Issue #2148 moved all registering of radar products to spring files instead of static methods in Java classes
Former-commit-id: 49d4df407c
[formerly d5e0eadb2a
] [formerly 57a57ad677
] [formerly 49d4df407c
[formerly d5e0eadb2a
] [formerly 57a57ad677
] [formerly 618fabe94f
[formerly 57a57ad677
[formerly a454e0e19a3f4eca2c6b0a797de0aacb3d2934c8]]]]
Former-commit-id: 618fabe94f
Former-commit-id: 625349673d
[formerly e82bec7b87
] [formerly 6e4d3a6ae05aa613e1b182e6a074108fda083abc [formerly 4a668cf47d
]]
Former-commit-id: a6af9d8533f376c07f7a5005885bad2024de6348 [formerly 9bd980541d
]
Former-commit-id: 6edb257ca5
2013-07-30 21:32:42 -05:00
Matt Nash
03f95aa950
Issue #2148 moved all registering of radar products to spring files instead of static methods in Java classes
...
Change-Id: Ie4dee73bdf63712f372b3067e59e0dbb499d6d5c
Former-commit-id: 1ddd6bac8f
[formerly d29749fc55
] [formerly d74c69a12e
] [formerly 1ddd6bac8f
[formerly d29749fc55
] [formerly d74c69a12e
] [formerly 8588f67264
[formerly d74c69a12e
[formerly 518a93ba1830230e504b576ad35ffb9453a1817c]]]]
Former-commit-id: 8588f67264
Former-commit-id: d52d3050f4
[formerly f52266b45a
] [formerly 9f21b626b2e73128e1287fcc74f96d1fad125c5d [formerly 04ad305b94
]]
Former-commit-id: c830c9add29c350f2dbe1336d3256c97c5ec5bbe [formerly 202c739bbb
]
Former-commit-id: 3b1170aef6
2013-07-30 09:05:31 -05:00
Dave Hladky
4f821f0bd8
Issue #2180 encrypt credential storage
...
Change-Id: If617535df024216c8d089a67c326c098e906724e
Former-commit-id: 3c5ed94610
[formerly a9b8cad721
] [formerly a2260ac6d3
] [formerly 3c5ed94610
[formerly a9b8cad721
] [formerly a2260ac6d3
] [formerly adf02a83c0
[formerly a2260ac6d3
[formerly f912ce7c2806abdce17c2b994d9226cdacf1ff34]]]]
Former-commit-id: adf02a83c0
Former-commit-id: 4fc764ca3c
[formerly ac3b701421
] [formerly e0dae0061e18dad377413d63990d4054adbe3d1b [formerly 703614af1d
]]
Former-commit-id: 563563d284924df77b94b1b54e6b0645fba33317 [formerly 4819c8f895
]
Former-commit-id: 5e0cbdab23
2013-07-30 08:33:59 -05:00
Brad Gonzales
27535bcd85
Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes.
...
Change-Id: I3239daa25a4bc2116ff3423bfa71afe3947faff0
Former-commit-id: 7ad2b1c953
[formerly a053fc85f7
] [formerly 8a6ab05561
] [formerly 7ad2b1c953
[formerly a053fc85f7
] [formerly 8a6ab05561
] [formerly 18201a0153
[formerly 8a6ab05561
[formerly 9bea23cc83e7262721efa4fef9b573d4dd540502]]]]
Former-commit-id: 18201a0153
Former-commit-id: 645d36f98f
[formerly 02bb327341
] [formerly df7ab4ff8c4d4e0fc3ec4b4ec3223eb60f7bf884 [formerly 22c62b6982
]]
Former-commit-id: 5c7e59dfe60a4bcf713bb02843323528371b08bf [formerly 95c15b253d
]
Former-commit-id: 9e62ae42a3
2013-07-29 11:56:10 -05:00
Lee Venable
3959eaf9eb
Merge "Issue #2217 - Added better error handling" into development
...
Former-commit-id: c71c388b1c
[formerly d97698519d
] [formerly f3c4306987
] [formerly c71c388b1c
[formerly d97698519d
] [formerly f3c4306987
] [formerly ccf6962224
[formerly f3c4306987
[formerly 880308a45215aba37e9f6fa367f0848cdbb0da51]]]]
Former-commit-id: ccf6962224
Former-commit-id: 4d36f90396
[formerly 824b855490
] [formerly df76bd2f6d088b036ea13625efcf10dec752bfc4 [formerly e2002c1d7e
]]
Former-commit-id: 0a31e4aa142dea52d8f35082d7e5dab8a7fd6baa [formerly 68b0385add
]
Former-commit-id: 83193a51e7
2013-07-29 11:44:59 -05:00
Richard Peter
3700fee040
Merge "Issue #1051 Discard bufrmos data with invalid location." into development
...
Former-commit-id: 68b984fdf6
[formerly a75ada03f9
] [formerly ff13fdaf20
] [formerly 68b984fdf6
[formerly a75ada03f9
] [formerly ff13fdaf20
] [formerly 450af19c9c
[formerly ff13fdaf20
[formerly 15e7809ca7503415ba0603cc39e7f0543d1e5af1]]]]
Former-commit-id: 450af19c9c
Former-commit-id: 13532b004b
[formerly d924e6e0c4
] [formerly e26acaa0a5fad18af89f10a819a2673923d93588 [formerly d76d407ca5
]]
Former-commit-id: d6c535f1b4964ac43312ce43c5d4b2eb56e2ed42 [formerly cbc50f4d83
]
Former-commit-id: 278e17b0de
2013-07-29 11:12:19 -05:00
Richard Peter
aedc1bce08
Merge "Issue #2231 Make edex startup more configurable" into development
...
Former-commit-id: 0943bb51fc
[formerly 49b9422554
] [formerly cd8535f182
] [formerly 0943bb51fc
[formerly 49b9422554
] [formerly cd8535f182
] [formerly 736c88ae6c
[formerly cd8535f182
[formerly da8f06eeb0bb2b68047896547d0181bdb0e82928]]]]
Former-commit-id: 736c88ae6c
Former-commit-id: c40ba8d0f0
[formerly 78ed556f82
] [formerly 707a7144d0b8d6053bc190ab8b34968976144409 [formerly 635a54caf9
]]
Former-commit-id: 1d19727ac03dcbe702f32c28e48e96e27429780d [formerly 61e3d26c20
]
Former-commit-id: e4f10f0968
2013-07-29 10:14:58 -05:00
Ben Steffensmeier
17ab4e680c
Issue #1051 Discard bufrmos data with invalid location.
...
Former-commit-id: e516491b26
[formerly 239033f268
] [formerly 7ee9aee40a
] [formerly e516491b26
[formerly 239033f268
] [formerly 7ee9aee40a
] [formerly a5112b6e19
[formerly 7ee9aee40a
[formerly 17c5060c2cb1101d93550904fec3f59704838ff1]]]]
Former-commit-id: a5112b6e19
Former-commit-id: 8cfdc7b3d6
[formerly 661fa14886
] [formerly f2ed00bfbb3b1d6abc50f94be2ad8467b495f25f [formerly cfcdc38fe7
]]
Former-commit-id: 276a8791818793ff5e611316da7bd250af7653f3 [formerly f14be3c12b
]
Former-commit-id: 7b67f05f01
2013-07-26 17:42:06 -05:00
Richard Peter
4e00a449b7
Issue #2170 : Initial plugin rename for notification framework
...
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13
Former-commit-id: a3d9294d13
[formerly bf99d8fd4d
] [formerly 359ee5d1af
] [formerly a3d9294d13
[formerly bf99d8fd4d
] [formerly 359ee5d1af
] [formerly 8ba840f1d9
[formerly 359ee5d1af
[formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 85884ccfd1
[formerly 43453bcbff
] [formerly 0dc19249f2e6c34a8ed77014c3334f26ca6a83c9 [formerly 16e182d70b
]]
Former-commit-id: a4aa95423528b7d80ac7bfb1f4727754c4129e0b [formerly 51773c757e
]
Former-commit-id: 5665e7eb9e
2013-07-26 14:36:46 -05:00
Greg Armendariz
db80172d26
Issue #2207 - Fix build
...
Former-commit-id: 95c6f59fbc
[formerly 5185e13a33
] [formerly 818a8a35d3
] [formerly 95c6f59fbc
[formerly 5185e13a33
] [formerly 818a8a35d3
] [formerly 578c307d40
[formerly 818a8a35d3
[formerly 86ca9354e8800acd2f15633e0f44980627a0359f]]]]
Former-commit-id: 578c307d40
Former-commit-id: 617f671ec4
[formerly b6d33739cf
] [formerly d28c58d094c6c2c69006ead370ae2971afa2b779 [formerly 2411fbf362
]]
Former-commit-id: 28f8931754348b8c3f36c9e3440010d495be5d46 [formerly 3994063cd6
]
Former-commit-id: fe79423966
2013-07-26 08:44:52 -05:00
Ron Anderson
88956eedbf
Merge "Issue #2044 Fix topo retrieval in ifpnetCDF" into development
...
Former-commit-id: d03977c8be
[formerly f0b278ad16
] [formerly f3138d7bd9
] [formerly d03977c8be
[formerly f0b278ad16
] [formerly f3138d7bd9
] [formerly 668cbd0c87
[formerly f3138d7bd9
[formerly 50129c57d6cc798da0dcf6b5f9b84811af5f6fa1]]]]
Former-commit-id: 668cbd0c87
Former-commit-id: 7216cc451e
[formerly 3221f96696
] [formerly a34f34558a475b7d104e70954a47c3c1c7f1904b [formerly 28863afe77
]]
Former-commit-id: e2baa80fd6e5878a963ef4fe8b342329c98723f8 [formerly 26a029cb5f
]
Former-commit-id: 9a2bcc145c
2013-07-25 18:17:08 -05:00
Ron Anderson
08da44e136
Issue #2044 Fix topo retrieval in ifpnetCDF
...
Change-Id: I3e15f9ed8a5e7577332fade9cfabeb9734fd1d20
Former-commit-id: 2ec3c5eb95
[formerly d850a79cbd
] [formerly 807b4ee431
] [formerly 2ec3c5eb95
[formerly d850a79cbd
] [formerly 807b4ee431
] [formerly f6f19065e6
[formerly 807b4ee431
[formerly 9bacbf50094476cfb01be5b9ae1f535ca4afd1c9]]]]
Former-commit-id: f6f19065e6
Former-commit-id: 72f4e4f14f
[formerly 754e521085
] [formerly efa321e63a18527d354b11a2b5486ade82a7fce3 [formerly e5551d529a
]]
Former-commit-id: 01883b98514926168430c3b3bf9783e276542c3e [formerly 59924c01b5
]
Former-commit-id: 26e98bdc0b
2013-07-25 18:14:38 -05:00
Nate Jensen
07e32f95f7
Issue #2207 removing custom org.junit
...
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b
Former-commit-id: b429fdd192
[formerly fd14405886
] [formerly 185296c67d
] [formerly b429fdd192
[formerly fd14405886
] [formerly 185296c67d
] [formerly 4ccfc5be82
[formerly 185296c67d
[formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]]]
Former-commit-id: 4ccfc5be82
Former-commit-id: 1f3f5ace25
[formerly 93976753df
] [formerly 732c085e88be485c5665de3436f4d63820939a50 [formerly a3fd5fa3ee
]]
Former-commit-id: 22483908ee1d82807ddfff8307bf138123ebbb9d [formerly 2e5b04450e
]
Former-commit-id: ed3a464cdf
2013-07-25 16:48:18 -05:00
Ron Anderson
5fcf50976f
Merge "Issue #2044 Refactor of GFE Server code" into development
...
Former-commit-id: d31300ae2d
[formerly b3619c1ba4
] [formerly 604cfd2070
] [formerly d31300ae2d
[formerly b3619c1ba4
] [formerly 604cfd2070
] [formerly 0428b8fb7b
[formerly 604cfd2070
[formerly 3720bf498346073343d0dff7a6949d3f7f0d5f62]]]]
Former-commit-id: 0428b8fb7b
Former-commit-id: 8f1392adb2
[formerly 9e10143fb2
] [formerly fdede04caaf020efc425615ddb25f1baf3096304 [formerly b084626454
]]
Former-commit-id: 518fb9e06a2a1cc7e3c87159590a2757a57c6e93 [formerly 68de87a472
]
Former-commit-id: 584e4946f9
2013-07-25 13:59:17 -05:00
Ron Anderson
cd69e79fa3
Issue #2044 Refactor of GFE Server code
...
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35
Former-commit-id: e97351d981
[formerly d32f777957
] [formerly cfa2d38a32
] [formerly e97351d981
[formerly d32f777957
] [formerly cfa2d38a32
] [formerly a915cdab25
[formerly cfa2d38a32
[formerly 03c62b606659be0cf81c8401a1c52c5fe5c52b1b]]]]
Former-commit-id: a915cdab25
Former-commit-id: 57332aa94a
[formerly a40cde69de
] [formerly 050757a603a935e3e7b340b3f32becba5adb5f15 [formerly 46d47d61e7
]]
Former-commit-id: 2e1838b83b3b0dea8269e3ceb154fdb3796eb058 [formerly 7c0b176b9d
]
Former-commit-id: 13e808b34d
2013-07-25 13:05:56 -05:00
Nate Jensen
2cfedda23c
Issue #2208 moving edex unit tests to tests project
...
Change-Id: I9189ebd225df930d021855c19d338e74af800702
Former-commit-id: 4b14026435
[formerly 2103294b75
] [formerly 8d1e19f2df
] [formerly 4b14026435
[formerly 2103294b75
] [formerly 8d1e19f2df
] [formerly 15fae243c9
[formerly 8d1e19f2df
[formerly 37c1d3c5b1a60260a537951c8a4bbceef4204029]]]]
Former-commit-id: 15fae243c9
Former-commit-id: 8daa0c9ae8
[formerly be35d04928
] [formerly 4d4ce0a9603f247eb573e5562887a5ae4518d04d [formerly fd38b63609
]]
Former-commit-id: 68e6249f0a095eac8ca13dc66d427b00a6b0a310 [formerly 52dfbc9f9f
]
Former-commit-id: 820150deb3
2013-07-25 12:29:46 -05:00
Everett Kladstrup
43814b2bfb
Issue #2231 Make edex startup more configurable
...
* Allow for skipping the RPM check
* Allow for using system java in wrapper instead of hard-coded /awips2/java
* Allow for configuring wrapper process actions with system variables
e.g. RESTART vs. SHUTDOWN on crash
Change-Id: Icaa3b3e388013a8106db6e29fd999aa5824c72bc
Former-commit-id: 2c518b816d
[formerly 3bb1b03cb7
] [formerly e056592ba9
] [formerly 2c518b816d
[formerly 3bb1b03cb7
] [formerly e056592ba9
] [formerly 9515d45e9d
[formerly e056592ba9
[formerly 7834360e8c56ac74b29a585eeda8c0387067250b]]]]
Former-commit-id: 9515d45e9d
Former-commit-id: 5e5504d664
[formerly 37ce990b54
] [formerly 96047241098de435c61202b2dde98576c53cbe5e [formerly b9dda179a0
]]
Former-commit-id: 9007806deec2984a2810679a8328709844d63980 [formerly eec23b6971
]
Former-commit-id: 33693f1903
2013-07-25 12:22:32 -05:00
Roger Ferrel
03630892ec
Issue #2216 Removetime stamp filer when copying to a hdf5 file.
...
Change-Id: Ib3ff230e410a73ea63c5d5f5dc2a27efa663921f
Former-commit-id: cfbfe1852d
[formerly ded6102f7d
] [formerly 47632854c3
] [formerly cfbfe1852d
[formerly ded6102f7d
] [formerly 47632854c3
] [formerly e90ec9184c
[formerly 47632854c3
[formerly ec1c371beb034e8ea256c18b7da074cabebe56f4]]]]
Former-commit-id: e90ec9184c
Former-commit-id: 59c42662ca
[formerly d6e54addf1
] [formerly 4d34be19b514b34d22fe966ed6e032c59e6e1c69 [formerly b9bcc23b96
]]
Former-commit-id: f1005a2e5707d7ba56e0fb4aebc81dc22c60a2a0 [formerly bf6acd3414
]
Former-commit-id: 52ad86b071
2013-07-24 15:21:18 -05:00
Mike Duff
9bdf1eb9e5
Issue #2217 - Added better error handling
...
Change-Id: Ia15b57fbee9e3cecb93ac711ca3d99529df3ac00
Former-commit-id: 3b7ec84774
[formerly 45b0119059
] [formerly 8ac8e405ec
] [formerly 3b7ec84774
[formerly 45b0119059
] [formerly 8ac8e405ec
] [formerly e584ddbf45
[formerly 8ac8e405ec
[formerly b7a602066d1c01a9b6399d2dade3ed3dd487103e]]]]
Former-commit-id: e584ddbf45
Former-commit-id: 19fdfa9655
[formerly b808324f11
] [formerly cd3153bdacc28457d75378b4d7f0899581c112ca [formerly f98a232c8b
]]
Former-commit-id: 7377ae15c7c8e8b584268d48d0648e69f4bf279c [formerly 31ec8c5118
]
Former-commit-id: e3b763b990
2013-07-24 13:54:33 -05:00
Nate Jensen
31e5647cd0
Merge "Issue #2032 move warngen files out of build.edex" into development
...
Former-commit-id: 91a41431a1
[formerly 3dc28df1e7
] [formerly b300d9a847
] [formerly 91a41431a1
[formerly 3dc28df1e7
] [formerly b300d9a847
] [formerly 90646a6cb9
[formerly b300d9a847
[formerly b81e696e390e7d46939e546661a56d23b7c965cf]]]]
Former-commit-id: 90646a6cb9
Former-commit-id: d023b3d75b
[formerly fe41d0e590
] [formerly c749231248976af3265055563f94e8716ac64886 [formerly f5ab274c2c
]]
Former-commit-id: c12bddc7d9db46f2092563fcd674c7aa0613fa09 [formerly a11d6376cf
]
Former-commit-id: 49ef86992f
2013-07-24 12:53:48 -05:00
Richard Peter
aba64d0dc4
Merge "Issue #1953 added madis distribution srv config file. added gunzip to route for madis ingest." into development
...
Former-commit-id: 5f9f041ee0
[formerly 7427ec9c3c
] [formerly 5cc249186d
] [formerly 5f9f041ee0
[formerly 7427ec9c3c
] [formerly 5cc249186d
] [formerly 9450910f54
[formerly 5cc249186d
[formerly e12170bac70d242572b7720c954b65735b202409]]]]
Former-commit-id: 9450910f54
Former-commit-id: dd0188629e
[formerly bfba94f286
] [formerly 191643f0412b43ecf2a1195efc9f1b08f7f9fac0 [formerly 716e02fa4c
]]
Former-commit-id: 8fc37a7d460b36ca202e2d6804b4aa60b120389d [formerly d9e41b3458
]
Former-commit-id: f872d4f916
2013-07-24 11:39:39 -05:00
Nate Jensen
583c06d64a
Issue #2032 move warngen files out of build.edex
...
Change-Id: Ie91caef086abca30d4b509453e1172a75fbaa09f
Former-commit-id: 7b22b2f72d
[formerly 6180a3ba60
] [formerly 22e72a646f
] [formerly 7b22b2f72d
[formerly 6180a3ba60
] [formerly 22e72a646f
] [formerly 4eb21a4ea3
[formerly 22e72a646f
[formerly eabd12dbcb081897ed340394efee2e9482fab3c7]]]]
Former-commit-id: 4eb21a4ea3
Former-commit-id: d7e194a476
[formerly b02bd4f7d8
] [formerly 044de761ebafac76ebf4e508d988ea954ff88168 [formerly 72726a8484
]]
Former-commit-id: 77c46ef5c3cffa175bf1116e2d5e6ab5f7405c67 [formerly 6450502d65
]
Former-commit-id: 0ea836cc8d
2013-07-24 09:35:24 -05:00
Nate Jensen
8dd49daed8
Issue #2215 upgrade thrift to version 0.9.0
...
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70
Former-commit-id: 8707633263
[formerly 7197e75c15
] [formerly 7b4938a999
] [formerly 8707633263
[formerly 7197e75c15
] [formerly 7b4938a999
] [formerly 8898a6d2ba
[formerly 7b4938a999
[formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: c869207445
[formerly 7c438bd944
] [formerly 4fe140d3706a9bb93c749820c213f4a95dd40dbc [formerly 375ad89ac8
]]
Former-commit-id: 03082558b26f67648b804696198cf0f48e47ed8f [formerly fa24302a76
]
Former-commit-id: 3aba42df34
2013-07-23 12:28:07 -05:00
David Gillingham
380b13d352
Issue #1762 : Fix Service Backup regression caused by last commit under this
...
ticket: NullPointerException caused by missing DynamicSerialize annotation and
disabled export configuration option caused by incomplete request.
Former-commit-id: e96c2962a5
[formerly 9fa6048f38
] [formerly 881566d46b
] [formerly e96c2962a5
[formerly 9fa6048f38
] [formerly 881566d46b
] [formerly 938f9cd7f7
[formerly 881566d46b
[formerly 071f7e80fc09720a3b1763d4903eb75fb96ebcca]]]]
Former-commit-id: 938f9cd7f7
Former-commit-id: f22922eaca
[formerly 72e808cb1c
] [formerly 148b8c40d4c89da3d04e1f5c6a0dc0ba21499d31 [formerly 42f096abe8
]]
Former-commit-id: 059d65f359518574a4d1fa4376a7b2dbfb491997 [formerly 274ca5a740
]
Former-commit-id: 888a61c520
2013-07-22 17:24:00 -05:00
Ron Anderson
7b0cc7ccd1
Merge "Issue #2009 : Implement dual-domain GFE export_grids solution. Update MHS emulator program to support new directory structure and some code cleanup and refactoring." into development
...
Former-commit-id: 0b8a7a5725
[formerly 89a1c1b2c9
] [formerly eb7893c0ba
] [formerly 0b8a7a5725
[formerly 89a1c1b2c9
] [formerly eb7893c0ba
] [formerly 6540885809
[formerly eb7893c0ba
[formerly ba587ef79d0db60aa31b681e1a0614d2fee65417]]]]
Former-commit-id: 6540885809
Former-commit-id: 6a13573cbc
[formerly 8425e10cbc
] [formerly fe10c63301d5526605b465bdd6d822d6248227eb [formerly d54aa6fe0b
]]
Former-commit-id: cd4ffe0deb9045272ba557873132ebd522bc42fd [formerly 577819698c
]
Former-commit-id: 6548d151d3
2013-07-22 13:29:24 -05:00
Nate Jensen
325654d640
Issue #2142 removing some viz dependencies on edex.common
...
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c
Former-commit-id: 178107c128
[formerly bcdaae1922
] [formerly 22438766b4
] [formerly 178107c128
[formerly bcdaae1922
] [formerly 22438766b4
] [formerly 4c9cc211ec
[formerly 22438766b4
[formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 78e718122d
[formerly a51d424851
] [formerly 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee [formerly 797760bb71
]]
Former-commit-id: c97be13fa7db2191a5a8ef2ef39d349d3dc46e1b [formerly c28a52bee8
]
Former-commit-id: 3e7f3c66a8
2013-07-22 12:20:43 -05:00
Ron Anderson
68865236c0
Merge "Issue #2185 Cache computed grid reprojections." into development
...
Former-commit-id: ddf5165267
[formerly 1a479e848f
] [formerly ecce97701f
] [formerly ddf5165267
[formerly 1a479e848f
] [formerly ecce97701f
] [formerly cd639e0220
[formerly ecce97701f
[formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]]]]
Former-commit-id: cd639e0220
Former-commit-id: dbb6dccf32
[formerly 95a153d410
] [formerly 5eebb28a1dedb2ebe2a2eea184eb9d3992c79673 [formerly 61e947ba76
]]
Former-commit-id: 1840803adffc759f326493517607dd5a041b4786 [formerly 8bff2be5dc
]
Former-commit-id: d9df33da78
2013-07-22 11:43:48 -05:00
Richard Peter
1d08e54d43
Merge branch 'omaha_13.5.1' (13.5.1-7) into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
rpms/awips2.cave/deploy.builder/build.sh
Former-commit-id: 19dacc32c1
[formerly 401ed88e44
] [formerly 15d1a6eab0
] [formerly 19dacc32c1
[formerly 401ed88e44
] [formerly 15d1a6eab0
] [formerly c6386e306f
[formerly 15d1a6eab0
[formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e
[formerly e7ec068c7e
] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539
]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b
]
Former-commit-id: 2a9cfe51af
2013-07-22 09:40:18 -05:00
Richard Peter
5977b7de0c
Merge "Issue #1655 - Implement the framework for DD system status messaging" into development
...
Former-commit-id: e0564b3b6c
[formerly d075546952
] [formerly 51a097fb8d
] [formerly e0564b3b6c
[formerly d075546952
] [formerly 51a097fb8d
] [formerly 7ceaed43c3
[formerly 51a097fb8d
[formerly 638b708123bb5a89292cc7778ed8211102718d28]]]]
Former-commit-id: 7ceaed43c3
Former-commit-id: bbd3b18d5f
[formerly ce7e6eeeed
] [formerly d38a47bc4241e93cb847b7f2b7c520baf5764f92 [formerly 5026801885
]]
Former-commit-id: 8de0536fd2eff02f9c40a5b2f1e2b773ea915da0 [formerly 7fc81195f0
]
Former-commit-id: 6ba6248d49
2013-07-21 22:54:14 -05:00
Richard Peter
dedba8b339
Merge "Issue #1653 - Add a subscription summary" into development
...
Former-commit-id: f5040c96b7
[formerly c926f71281
] [formerly 73c2547981
] [formerly f5040c96b7
[formerly c926f71281
] [formerly 73c2547981
] [formerly 68e565fdd9
[formerly 73c2547981
[formerly 74351187e3b7061ecfdfd040ff88b81823055889]]]]
Former-commit-id: 68e565fdd9
Former-commit-id: 0845c5e3d1
[formerly d922c86c26
] [formerly 94ee77045edc6a368692dfc25e52a4a8f9104a06 [formerly 992b544e33
]]
Former-commit-id: de6de7b31d9114349745d4351107561f72323ae8 [formerly 64adb6ec6c
]
Former-commit-id: 56eac084b5
2013-07-21 22:04:02 -05:00
Richard Peter
ecb72bbbd1
Merge "Issue #1992 Remove redundant time columns from bufrua. Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90" into development
...
Former-commit-id: 9429c1cd71
[formerly 4dc5e4ac27
] [formerly 857426cc44
] [formerly 9429c1cd71
[formerly 4dc5e4ac27
] [formerly 857426cc44
] [formerly c7e9cd592e
[formerly 857426cc44
[formerly 57a6241f16973a6e793d0917ca4242a51bfd55f6]]]]
Former-commit-id: c7e9cd592e
Former-commit-id: 1c023492a9
[formerly 54d607a63f
] [formerly 25cb9281915b246dafc2c45370d2c68f3373388d [formerly a86bc58e13
]]
Former-commit-id: bb06bb9e4440d1688c0b02cfffe8b4cd0674d9e9 [formerly 73b4dfdff9
]
Former-commit-id: 1b96d1cbf4
2013-07-21 21:57:38 -05:00
Richard Peter
4232d10f8b
Merge "Issue #2194 Fix site override." into development
...
Former-commit-id: bd05184660
[formerly 09b2f9fa7e
] [formerly 26ab0ff706
] [formerly bd05184660
[formerly 09b2f9fa7e
] [formerly 26ab0ff706
] [formerly 347fb5bc2f
[formerly 26ab0ff706
[formerly f32db14a29a2d545aa44dddf0bec0d4e5e56069b]]]]
Former-commit-id: 347fb5bc2f
Former-commit-id: 19beaef3fc
[formerly 3ddae2a6e5
] [formerly 52c02331b3ac7bb70cc2423580905b8d948d36fd [formerly 3719e0d32f
]]
Former-commit-id: 0c46c56907eb6e36099019b1a54e3b771ee02d8d [formerly 6318d3dec0
]
Former-commit-id: bd403dc35a
2013-07-21 21:45:43 -05:00
Ben Steffensmeier
07017164f1
Issue #1992 Remove redundant time columns from bufrua.
...
Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90
Former-commit-id: 095f200bd9
[formerly e11099ff24
] [formerly ad0cefc7fa
] [formerly 095f200bd9
[formerly e11099ff24
] [formerly ad0cefc7fa
] [formerly 9c55581ad2
[formerly ad0cefc7fa
[formerly 3e916aad7d281ba53cd1634a15d7ac521943bc75]]]]
Former-commit-id: 9c55581ad2
Former-commit-id: 8045e0c18c
[formerly f6eb262152
] [formerly 7fbf5157984fd1fdbb4718c783654069ee6d1a47 [formerly a4f75b68d4
]]
Former-commit-id: da394c61610b65100d8f3a206295fd77adbf1e4a [formerly 71a32933c4
]
Former-commit-id: c584a6797d
2013-07-19 11:53:23 -05:00
Dustin Johnson
55b373071b
Merge "Issue #2193 - Fix for DD data browser subscription column." into development
...
Former-commit-id: 48daaa343b
[formerly 9dbf1c69d8
] [formerly 8e78f80ddd
] [formerly 48daaa343b
[formerly 9dbf1c69d8
] [formerly 8e78f80ddd
] [formerly 1acaf2dbfa
[formerly 8e78f80ddd
[formerly 674aeafa6f5d317a30e1f078b1ee38acff6acf95]]]]
Former-commit-id: 1acaf2dbfa
Former-commit-id: ae0b440061
[formerly 176b1fddfb
] [formerly 4e04acfbd88020959c649d17548647bac210a17e [formerly 900241dc68
]]
Former-commit-id: 89c89ee2b0104ea09494b26237634c9d8b3ca000 [formerly 698cf4a9a7
]
Former-commit-id: d8e5f6550f
2013-07-19 10:40:45 -05:00
Dave Hladky
f395ea040d
Issue #2209 Fixed un-serialized subscription in BandwidthManager
...
Change-Id: I7fd734cf360a55ab3d8f5869963dc50dd7d4f5a4
Former-commit-id: 5bb599bbfe
[formerly e72a0afa66
] [formerly 6da58160d6
] [formerly 5bb599bbfe
[formerly e72a0afa66
] [formerly 6da58160d6
] [formerly e9b3030a6f
[formerly 6da58160d6
[formerly 4107e8c2ab354d3bfb59b9c633cbd55bc0810066]]]]
Former-commit-id: e9b3030a6f
Former-commit-id: d6a79d49be
[formerly 404087b14f
] [formerly 08fea8099b324bfb60699a31afbbf120225acc0e [formerly ca04bb6dd6
]]
Former-commit-id: bf296b65bcbda055e3338971ef43ed1fdcd5c73e [formerly a5416b471b
]
Former-commit-id: 5a551a6e0e
2013-07-19 10:08:09 -05:00
Richard Peter
69af3f93ca
Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 8e3a28636c
[formerly 85fb4c3940
] [formerly 7e08c04383
] [formerly 8e3a28636c
[formerly 85fb4c3940
] [formerly 7e08c04383
] [formerly cc7189fcb7
[formerly 7e08c04383
[formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: e46425cd8d
[formerly eefaf2c836
] [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343
]]
Former-commit-id: fcddfd2ee1c278a22544ea6d0efd7a301de67fff [formerly 3a573f4256
]
Former-commit-id: 374879df01
2013-07-18 21:46:25 -05:00
Nate Jensen
2ac94b1152
Issue #2032 moving localization edex_static files to respective plugins, except colormaps
...
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf
Former-commit-id: 3d226c0e69
[formerly 2ee87452db
] [formerly da311b00a8
] [formerly 3d226c0e69
[formerly 2ee87452db
] [formerly da311b00a8
] [formerly b7ea2ae30b
[formerly da311b00a8
[formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]]]]
Former-commit-id: b7ea2ae30b
Former-commit-id: e0650650c9
[formerly 41d3e45e60
] [formerly d21a0f2bca28d0f158a5d74da9f0d15c638ab7ac [formerly dce6c06174
]]
Former-commit-id: 1adfa30cf69529b0b748acde939b453b7a7d7b49 [formerly b997f2a670
]
Former-commit-id: 6d7658e02e
2013-07-18 17:20:27 -05:00
Ben Steffensmeier
1f6e59c6ce
Issue #2194 Fix site override.
...
Former-commit-id: 63dfcb59da
[formerly e01f3b5b0e
] [formerly 1e9fe8ba48
] [formerly 63dfcb59da
[formerly e01f3b5b0e
] [formerly 1e9fe8ba48
] [formerly ca6cba7b41
[formerly 1e9fe8ba48
[formerly b8a15544a205663adb4106453b4606d7f31f0423]]]]
Former-commit-id: ca6cba7b41
Former-commit-id: dcf44a8219
[formerly 1ebe55a213
] [formerly 04b6aab49f71dc6f9a94c46624ebe5c357b2c720 [formerly 61cde4953c
]]
Former-commit-id: a06206553644a811e9f9368f19dff4ecded30544 [formerly 63f6a96a77
]
Former-commit-id: 0365236455
2013-07-18 15:29:41 -05:00
Mike Duff
d3d47d6d4e
Issue #1653 - Add a subscription summary
...
Change-Id: I677ae6d472a4de5bd8905650b2e13ffc1e2af149
Former-commit-id: 271959462c
[formerly 3cac2bd4ba
] [formerly 823f064ef8
] [formerly 271959462c
[formerly 3cac2bd4ba
] [formerly 823f064ef8
] [formerly d5ef7f056f
[formerly 823f064ef8
[formerly d64a7895e08df47feedfb95edec033d0c87384c1]]]]
Former-commit-id: d5ef7f056f
Former-commit-id: b8b8adfe89
[formerly efea9b3739
] [formerly 8dcb19154786aa426856c5a801762302c07e0dc2 [formerly b4c9a0066a
]]
Former-commit-id: ac8cbf8a13c1770ff77b165f9cefbcd1e953b9e1 [formerly 00904dc8ec
]
Former-commit-id: 2b08ae68ff
2013-07-18 14:53:10 -05:00
Mike Duff
2fe6fa3800
Issue #2193 - Fix for DD data browser subscription column.
...
Change-Id: I1a76cdac15273b2e1b5b76095d9ae5f3ece8c1a3
Former-commit-id: 64c0321ac6
[formerly 997d195db6
] [formerly 0ad0821d1c
] [formerly 64c0321ac6
[formerly 997d195db6
] [formerly 0ad0821d1c
] [formerly 8229d5a23f
[formerly 0ad0821d1c
[formerly 344193f08e3ced288cd223a0ae295d13aa50e13a]]]]
Former-commit-id: 8229d5a23f
Former-commit-id: bc3471b3f7
[formerly 22e08fc1bb
] [formerly 3c29b97739bff8c1739f10963f09157b93f9b97f [formerly 4495425388
]]
Former-commit-id: 2128514a60cacff261f20e63fb1c26804bfa0dbf [formerly 0cc0145076
]
Former-commit-id: aab1eea5df
2013-07-18 14:30:39 -05:00
Dustin Johnson
d7fc87cddf
Merge "Issue #2191 Fixed spring error" into development
...
Former-commit-id: 9a3cfe6fec
[formerly 45d84cf09f
] [formerly 4bd8184d8a
] [formerly 9a3cfe6fec
[formerly 45d84cf09f
] [formerly 4bd8184d8a
] [formerly 8b908afc8f
[formerly 4bd8184d8a
[formerly 8794f7763a3cb982c5c282b40cfc82b466f49e5f]]]]
Former-commit-id: 8b908afc8f
Former-commit-id: a09755465b
[formerly 952dfd04f1
] [formerly 36bde70385adc9206b5ae2e0a721fef0e65b95ae [formerly c79352ae95
]]
Former-commit-id: 7e056e756aac7691cc80c7c717ed91954ed78cca [formerly 433e683dc6
]
Former-commit-id: b7c8e82d1a
2013-07-18 13:21:01 -05:00
Benjamin Phillippe
269a687ca6
Issue #2191 Fixed spring error
...
Change-Id: Ia010d718640d1dd24f2e635eaae07dae6fa29a72
Former-commit-id: aff288e373
[formerly 245307d449
] [formerly 9f60b0b2f6
] [formerly aff288e373
[formerly 245307d449
] [formerly 9f60b0b2f6
] [formerly 831418e2c0
[formerly 9f60b0b2f6
[formerly 43bb45deb9075eea60ee82a66173bc7ee89d4f0a]]]]
Former-commit-id: 831418e2c0
Former-commit-id: cd82da999b
[formerly 95fad21198
] [formerly e71729b998fc34c6ae394cb24dc95eb8f3bf9bc5 [formerly 7fb8740fae
]]
Former-commit-id: 20cda7edecd66029681d5628823fa0f621aeec65 [formerly edcacb3dc7
]
Former-commit-id: 0aa1109598
2013-07-18 12:50:10 -05:00
Steve Harris
adf2f89d57
13.5.1-7 baseline
...
Former-commit-id: 67299457b1
[formerly 630705aa3f
] [formerly bf58a81b38
] [formerly 67299457b1
[formerly 630705aa3f
] [formerly bf58a81b38
] [formerly 86ce1248c2
[formerly bf58a81b38
[formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b
[formerly cb50a0028d
] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5
]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd
]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Nate Jensen
6c2fa164e3
Issue #2032 removing user-specific colormap files
...
Change-Id: Ia48f3100233c185514ca65acd0086a72f26ec7f1
Former-commit-id: 427ab79e9c
[formerly 50c17a691c
] [formerly 5aef034545
] [formerly 427ab79e9c
[formerly 50c17a691c
] [formerly 5aef034545
] [formerly ba6851b0e6
[formerly 5aef034545
[formerly bd0401862fb0778cabb98e1fa8ef65925e25f649]]]]
Former-commit-id: ba6851b0e6
Former-commit-id: f337ec5f02
[formerly ffe57ce04e
] [formerly 5d6e67fb9a9c95a5af359967fd4f6518739f952c [formerly d479258121
]]
Former-commit-id: f001f64c329cfb14d8204eea8aadef6034794bf6 [formerly c63066c708
]
Former-commit-id: e721095714
2013-07-18 11:06:45 -05:00
Brad Gonzales
cd1f7af841
Issue #1953 added madis distribution srv config file. added gunzip to route for madis ingest.
...
Change-Id: I0adc04b1d396ea86c5a538c006b439febc730bca
Former-commit-id: 951db181e0
[formerly 5d64a78f65
] [formerly d9b20d6c37
] [formerly 951db181e0
[formerly 5d64a78f65
] [formerly d9b20d6c37
] [formerly 71d1e02613
[formerly d9b20d6c37
[formerly c087285778dcd68be66c7d45c91d50dc071f9e4a]]]]
Former-commit-id: 71d1e02613
Former-commit-id: ec56c28921
[formerly 063421974c
] [formerly edfec641968df0e790f8520420dff86a0d930b50 [formerly 3f987a8794
]]
Former-commit-id: 0766219ba195d4036cf91b7f177aafa5e1e76d3f [formerly ef2ae5422b
]
Former-commit-id: 10e566f2c1
2013-07-18 10:09:04 -05:00
Roger Ferrel
df37274974
Issue #1966 Relocation of configuration files and checks for bad configuration files.
...
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c
Former-commit-id: e5cd0e7599
[formerly e225bd674b
] [formerly c002045a87
] [formerly e5cd0e7599
[formerly e225bd674b
] [formerly c002045a87
] [formerly 91ee1d36bf
[formerly c002045a87
[formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]]]
Former-commit-id: 91ee1d36bf
Former-commit-id: 1f56a1179e
[formerly 97e4dc3633
] [formerly e674edd4dd9db03d4b9f31499b37657af33debd7 [formerly 95cb3439a4
]]
Former-commit-id: 4285173926a19c787c964793fdd7bd9e860c0e29 [formerly 47ac9a9147
]
Former-commit-id: 8d6092bbf0
2013-07-18 10:02:05 -05:00
Nate Jensen
2d6737f52c
Issue #2032 move build.edex's common-static files to appropriate plugins
...
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15
Former-commit-id: 87bfe94322
[formerly 188d76ea71
] [formerly 5264d3a5b8
] [formerly 87bfe94322
[formerly 188d76ea71
] [formerly 5264d3a5b8
] [formerly b767760a9c
[formerly 5264d3a5b8
[formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]]
Former-commit-id: b767760a9c
Former-commit-id: 0509e362b9
[formerly 93713d9698
] [formerly 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0
]]
Former-commit-id: 0d2fa08b78da80bd2050c50580bfb6d7564771fc [formerly 175a28da9a
]
Former-commit-id: 06502f57ef
2013-07-18 09:53:53 -05:00