Commit graph

6129 commits

Author SHA1 Message Date
brian.dyke
45dd00f016 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c2bb61e95 [formerly 95c5dc49c1] [formerly 2c2bb61e95 [formerly 95c5dc49c1] [formerly 03cc2fbbfb [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: b6623af1f7 [formerly e09bd1d283]
Former-commit-id: 3f9ac5ba24
2014-05-30 10:09:00 -04:00
Ron Anderson
9d6658f1e9 Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1
Former-commit-id: 27a9790684 [formerly 8309a5656a] [formerly 27a9790684 [formerly 8309a5656a] [formerly 7df866b471 [formerly e13f80b81df762d6658cce9ad534dc499791ba46]]]
Former-commit-id: 7df866b471
Former-commit-id: f1a6e6735c [formerly ff31990a13]
Former-commit-id: 30495f52db
2014-05-29 18:50:52 -05:00
Ron Anderson
0c06544416 Omaha #2841 Separate queuing of text formatters and product scripts.
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8

Former-commit-id: ce4047869c [formerly a9f3b486f3] [formerly ce4047869c [formerly a9f3b486f3] [formerly 8e1f4331da [formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]]
Former-commit-id: 8e1f4331da
Former-commit-id: 4d32cb561d [formerly f765c74e5e]
Former-commit-id: 114532dd8d
2014-05-29 16:55:02 -05:00
Richard Peter
aaab5e310f Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289

Former-commit-id: 3beef299b1 [formerly 558699a370] [formerly 3beef299b1 [formerly 558699a370] [formerly e2288769d3 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]
Former-commit-id: e2288769d3
Former-commit-id: 121f0e00a4 [formerly 220f7aa97a]
Former-commit-id: 8ba13f812e
2014-05-29 15:50:59 -05:00
Nate Jensen
c3e98aca83 Omaha #3211 changes to support improved authentication/authorization
Change-Id: If793dcbe3bed741f1b75ce338b152eb69d845172

Former-commit-id: e4029da3dc [formerly 4fdb6df9a1] [formerly e4029da3dc [formerly 4fdb6df9a1] [formerly 1e362625e5 [formerly c4eeb1730778f7f18aa4d74587ebcddb3932c6e6]]]
Former-commit-id: 1e362625e5
Former-commit-id: 4351e8a13d [formerly 5a484063ac]
Former-commit-id: a834abb826
2014-05-29 15:28:53 -05:00
Richard Peter
c5a6c313f3 Merge "Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository" into omaha_14.4.1
Former-commit-id: 82bf2b9e94 [formerly 9cd8710876] [formerly 82bf2b9e94 [formerly 9cd8710876] [formerly 1c04a15ec7 [formerly df4e87624ad0bc6db759677435e7c276f500d3da]]]
Former-commit-id: 1c04a15ec7
Former-commit-id: 2d9d34fb7b [formerly bd5bb6daaa]
Former-commit-id: 9aa0ecec3f
2014-05-29 14:13:54 -05:00
Richard Peter
735f0ca8b1 Merge "Omaha #3210 - moving foss from cots/ into AWIPS2_foss repository" into omaha_14.4.1
Former-commit-id: af040cffa8 [formerly fca34641a0] [formerly af040cffa8 [formerly fca34641a0] [formerly 0c8e7e05bd [formerly 933f04911ad40e66f49da96c872306f4e89a2eca]]]
Former-commit-id: 0c8e7e05bd
Former-commit-id: 30a41336d9 [formerly 82621fce98]
Former-commit-id: 6a39acde82
2014-05-29 14:01:22 -05:00
Nate Jensen
a49343ddbf Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: a709601e2f [formerly 5cfbcb7e98] [formerly a709601e2f [formerly 5cfbcb7e98] [formerly c43a2bf217 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]]
Former-commit-id: c43a2bf217
Former-commit-id: 9804b35063 [formerly c1d092a55d]
Former-commit-id: b4b684876a
2014-05-29 13:51:09 -05:00
Steve Harris
b09109b66e Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a

Former-commit-id: f857812561 [formerly 79d5592fdf] [formerly f857812561 [formerly 79d5592fdf] [formerly 5bc251beaa [formerly c944b3b98f68b8f65b853fb244002e3382dc38a2]]]
Former-commit-id: 5bc251beaa
Former-commit-id: 4af6e9f137 [formerly c830097b13]
Former-commit-id: 77e18c2e9a
2014-05-29 13:42:09 -05:00
Roger Ferrel
c882871747 Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085

Former-commit-id: eebc5096b2 [formerly 44a23b4500] [formerly eebc5096b2 [formerly 44a23b4500] [formerly 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]
Former-commit-id: 825e2c1b19
Former-commit-id: 73be1f66e9 [formerly 15545c5239]
Former-commit-id: 6c78b5e04c
2014-05-29 12:33:15 -05:00
Steve Harris
bdb969ecef Omaha #3210 - moving foss from cots/ into AWIPS2_foss repository
Former-commit-id: 119df754b6 [formerly 24de47720f] [formerly 119df754b6 [formerly 24de47720f] [formerly 9396273e49 [formerly 762b2ad4da3ab2944b0df17ce655bcc60d02bdc3]]]
Former-commit-id: 9396273e49
Former-commit-id: a9b3c772f0 [formerly 7c21bd17e6]
Former-commit-id: b9c03ee844
2014-05-29 12:00:50 -05:00
Brian Clements
b99b43e383 Omaha #3179 moved ebxml ecludes from datadelivery to registry modes
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de

Former-commit-id: 32cf8deb3a [formerly fb71fae2d1] [formerly 32cf8deb3a [formerly fb71fae2d1] [formerly 5abe7ea99d [formerly f3baedf6187a70e9c98d73b6819fa46e9c00c702]]]
Former-commit-id: 5abe7ea99d
Former-commit-id: dc1e069853 [formerly 14a50e4c3d]
Former-commit-id: 1a9aeb2ebd
2014-05-29 11:58:10 -05:00
Brian Clements
1ee9485a43 Omaha #3179 added modes directory to custom targets
Change-Id: I43587e7d33cddd8dcd4b8056c90cc88bd78df1fe

Former-commit-id: 04cba3e10e [formerly a1da843e2a] [formerly 04cba3e10e [formerly a1da843e2a] [formerly 77276d6efb [formerly 3d324c5b62a1f960099a5515cbd7c588ce7c5d7f]]]
Former-commit-id: 77276d6efb
Former-commit-id: 100c89ab9c [formerly 95088ed28d]
Former-commit-id: 0778629505
2014-05-29 09:08:53 -05:00
Brian Clements
fe7c15daa4 Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52

Former-commit-id: 4aade4bf2e [formerly 5d0eaf02ab] [formerly 4aade4bf2e [formerly 5d0eaf02ab] [formerly 542d36f107 [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]]
Former-commit-id: 542d36f107
Former-commit-id: 5a52531828 [formerly fcadd3dae9]
Former-commit-id: 7d841b655c
2014-05-29 08:19:47 -05:00
Ben Steffensmeier
f1aaf45669 Omaha #2990 Fix radar mesocyclone regex.
Former-commit-id: 5404dd5f83 [formerly c7c6c1b7ec] [formerly 5404dd5f83 [formerly c7c6c1b7ec] [formerly cd6ba70787 [formerly 8e03f08f2d01f8b47101c09f950a0830cf8f0bb6]]]
Former-commit-id: cd6ba70787
Former-commit-id: 757d792236 [formerly f669f3e22a]
Former-commit-id: 5ffb664f27
2014-05-28 16:40:35 -05:00
Nate Jensen
4269bec13b Merge "Omaha #3179 split modes.xml into plugin modes files" into omaha_14.4.1
Former-commit-id: a27988ec2c [formerly 942aa72b01] [formerly a27988ec2c [formerly 942aa72b01] [formerly 6beda0c45b [formerly eec07fb20d6566b1e1d361ef971e50e5a019fcbf]]]
Former-commit-id: 6beda0c45b
Former-commit-id: 125b98b6ce [formerly cff4bfc6f4]
Former-commit-id: c3e036884b
2014-05-28 13:42:07 -05:00
Brian Clements
902e576373 Omaha #3179 split modes.xml into plugin modes files
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a

Former-commit-id: 2baee319de [formerly 5e39a68498] [formerly 2baee319de [formerly 5e39a68498] [formerly 334bb53dea [formerly e626f47c9bb8900af2f4734513b2c94b83f082c8]]]
Former-commit-id: 334bb53dea
Former-commit-id: f2db2d8fef [formerly d79c63a429]
Former-commit-id: 2dcbd33a4e
2014-05-28 13:32:18 -05:00
Shawn Hooper
bc0d8972ed Merge "ASM #600 - the fixes for DR 17380" into asm_14.3.1
Former-commit-id: 1f036b4573 [formerly 422473b8a0] [formerly 1f036b4573 [formerly 422473b8a0] [formerly 87d98c31fb [formerly 25235d87722f50f4bd034002f2b9d7f1f9dfcd42]]]
Former-commit-id: 87d98c31fb
Former-commit-id: 82fd8d413d [formerly 7def8a109d]
Former-commit-id: c75cda44b3
2014-05-28 13:04:45 -05:00
Nate Jensen
d1f08dcaf1 Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1
Former-commit-id: 6fc643af39 [formerly 3e174fe39c] [formerly 6fc643af39 [formerly 3e174fe39c] [formerly 8cc13d8334 [formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]]
Former-commit-id: 8cc13d8334
Former-commit-id: c7da2eec51 [formerly a921570418]
Former-commit-id: fda484c9ff
2014-05-28 12:43:12 -05:00
Brian Clements
927857cbd7 Omaha #3152 modified rcm build to deploy logback instead of log4j
Change-Id: I829bea003053d5f2b0cf17234fc26a8ff35334ac

Former-commit-id: 3b2acfc091 [formerly c227a54da0] [formerly 3b2acfc091 [formerly c227a54da0] [formerly 190e877633 [formerly d9c3f3845e51f5892c80ec6e4b8ed6efc2769d0e]]]
Former-commit-id: 190e877633
Former-commit-id: eb101fbafd [formerly 16e80de9b4]
Former-commit-id: 0dcd0ebd4e
2014-05-28 12:17:39 -05:00
Ron Anderson
c237fd2699 Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1
Former-commit-id: 8b580a891d [formerly da0a173698] [formerly 8b580a891d [formerly da0a173698] [formerly 8b5daad4db [formerly 3869a36a6cad1674e8ec493d03937c21ddde7f21]]]
Former-commit-id: 8b5daad4db
Former-commit-id: 0198ceb40a [formerly 191283e96d]
Former-commit-id: 81c044d476
2014-05-28 11:59:51 -05:00
Richard Peter
984dc458b9 Merge "Omaha #3137 - Add checks to prevent NullPointerException." into omaha_14.4.1
Former-commit-id: 37ae3d341c [formerly daaaed85d5] [formerly 37ae3d341c [formerly daaaed85d5] [formerly 6a01bcd3b0 [formerly 93ab5e949da1f654ea15a2044b587125f3243ebc]]]
Former-commit-id: 6a01bcd3b0
Former-commit-id: 8691da5fec [formerly 4299d5cb18]
Former-commit-id: 5a0de0ff06
2014-05-28 11:07:41 -05:00
Nate Jensen
d7cba4a465 Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1
Former-commit-id: 719c53a044 [formerly 905fa8f283] [formerly 719c53a044 [formerly 905fa8f283] [formerly e7dc89cddd [formerly 55cf25f0671f17e667f7c785f3580a93267f8790]]]
Former-commit-id: e7dc89cddd
Former-commit-id: 3f434ea6e9 [formerly 05b1401849]
Former-commit-id: e4df449f49
2014-05-28 10:28:49 -05:00
Ron Anderson
1f4bde25d9 Omaha #3110 Permanent fix for mutable database creation.
Former-commit-id: 17da90e8db [formerly 4633de4ea3] [formerly 17da90e8db [formerly 4633de4ea3] [formerly b7271025f9 [formerly a0001c9ed3d414237069f43a29dd907111c16832]]]
Former-commit-id: b7271025f9
Former-commit-id: 3e5acbf168 [formerly f2733999de]
Former-commit-id: b6b463682f
2014-05-28 10:09:12 -05:00
Roger Ferrel
b9f63efb1c Omaha #3137 - Add checks to prevent NullPointerException.
Former-commit-id: d901d99bde [formerly 3331d58e1c] [formerly d901d99bde [formerly 3331d58e1c] [formerly b235e56e28 [formerly 42dcb85d536485f3ae244e69a315e88169d04c97]]]
Former-commit-id: b235e56e28
Former-commit-id: ac2a7ddca7 [formerly 009f4b8d21]
Former-commit-id: 02ad70e080
2014-05-28 09:54:37 -05:00
Steve Harris
02babdd057 Omaha #3132 - new TPCSurgeProb files should have gone to core in the merge
Former-commit-id: b87e3463e7 [formerly 63020bd766] [formerly b87e3463e7 [formerly 63020bd766] [formerly 66e157489e [formerly 80da354c8bacab21dc0675f280989c2d8e15acd4]]]
Former-commit-id: 66e157489e
Former-commit-id: f844acd104 [formerly 71d69e5d25]
Former-commit-id: 3aef3934a3
2014-05-28 09:32:43 -05:00
Steve Harris
5fda99b1fe Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
	edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java

Former-commit-id: 718c78d984 [formerly be80bd01f3] [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]
Former-commit-id: dc74953978
Former-commit-id: 0e9d0b2ef5 [formerly 713cfeffc7]
Former-commit-id: 6412cc1427
2014-05-28 09:01:00 -05:00
Steve Harris
1f24080b8e Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java

Former-commit-id: a4825f4b27 [formerly 2c49d14c12] [formerly a4825f4b27 [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]
Former-commit-id: 048d3748b7
Former-commit-id: 005e5b4ee2 [formerly 4ed44b6e72]
Former-commit-id: 95462b4f80
2014-05-28 07:41:42 -05:00
Nate Jensen
caf433d525 Omaha #3133 Removed dead hydro code and related dependencies
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: a984e7ac9a [formerly 514c9d3a0c] [formerly a984e7ac9a [formerly 514c9d3a0c] [formerly 67ac5fa242 [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]]
Former-commit-id: 67ac5fa242
Former-commit-id: a25a8b69eb [formerly c2f78a6888]
Former-commit-id: 11899e65e2
2014-05-27 18:23:38 -05:00
Nate Jensen
4ac91408d4 Merge "Omaha #2670 Fix airep manifest to work with CAVE spring." into omaha_14.4.1
Former-commit-id: 3747f80c89 [formerly 5be7360043] [formerly 3747f80c89 [formerly 5be7360043] [formerly 18a3239fd5 [formerly d9d68507505fa1b45f47a6b92148dca7884ccb1b]]]
Former-commit-id: 18a3239fd5
Former-commit-id: 8f3b574120 [formerly 588337605b]
Former-commit-id: ee19a68295
2014-05-27 15:49:00 -05:00
Nate Jensen
5ce703fb36 Merge "Omaha #2668 add support for data access framework to bufrua." into omaha_14.4.1
Former-commit-id: 71847c47e9 [formerly 01b511e1c9] [formerly 71847c47e9 [formerly 01b511e1c9] [formerly 73cf62dc96 [formerly 5a27ea58134dd64fcf684829b997cbd441f2c22e]]]
Former-commit-id: 73cf62dc96
Former-commit-id: dab8553af1 [formerly cda0b2ecea]
Former-commit-id: 93db14aeb1
2014-05-27 15:48:42 -05:00
Nate Jensen
4480f220d7 Merge "Omaha #2669 add support for data access framework to pirep." into omaha_14.4.1
Former-commit-id: 38bef10b88 [formerly 21ccf324eb] [formerly 38bef10b88 [formerly 21ccf324eb] [formerly b33ef5efe6 [formerly cb577d0a1eaa604825df83e3b8d2f7476b37d23f]]]
Former-commit-id: b33ef5efe6
Former-commit-id: 715e5bbe51 [formerly 253bac8911]
Former-commit-id: 0181026f04
2014-05-27 15:48:12 -05:00
Ben Steffensmeier
87f1cc6f56 Omaha #2669 add support for data access framework to pirep.
Former-commit-id: 0be1e981aa [formerly 7570a24b10] [formerly 0be1e981aa [formerly 7570a24b10] [formerly dd13f31356 [formerly c37d85ba479b8df38c90df522059b0c58eea6005]]]
Former-commit-id: dd13f31356
Former-commit-id: a9078dd9cb [formerly 04cae3aad7]
Former-commit-id: b8b9e64d65
2014-05-27 15:20:09 -05:00
Greg Armendariz
f746096b52 Omaha #3215 - Correct script
Former-commit-id: 9c26a31d27 [formerly ac528037a1] [formerly 9c26a31d27 [formerly ac528037a1] [formerly 73765c31ca [formerly 2565b4c918f9215fd65a5dc44778db3a200da8bf]]]
Former-commit-id: 73765c31ca
Former-commit-id: be8b2a480b [formerly c7040bce82]
Former-commit-id: 6a487942e9
2014-05-27 15:19:37 -05:00
Ben Steffensmeier
0c5eba4512 Omaha #2670 Fix airep manifest to work with CAVE spring.
Former-commit-id: d47c9fbd9c [formerly 46d737e01b] [formerly d47c9fbd9c [formerly 46d737e01b] [formerly 942bf638af [formerly 7dccca4d1c97ea8d97fb46b8ef1fa139a92b22b5]]]
Former-commit-id: 942bf638af
Former-commit-id: e6b9bccfc8 [formerly 4d5b86a29d]
Former-commit-id: 5765eb5430
2014-05-27 15:19:05 -05:00
Ben Steffensmeier
566094598d Omaha #2668 add support for data access framework to bufrua.
Former-commit-id: 6d2db6c21f [formerly 2c9de12c6f] [formerly 6d2db6c21f [formerly 2c9de12c6f] [formerly 0138296c13 [formerly 8ef33409df31f8ab9d69828b2d13e1bd8e979685]]]
Former-commit-id: 0138296c13
Former-commit-id: deea388b89 [formerly 79410db3d8]
Former-commit-id: f22960be7b
2014-05-27 15:16:08 -05:00
Greg Armendariz
f762c13276 Merge "Omaha #3215 - Add option for RPM build," into omaha_14.4.1
Former-commit-id: 92b83788e4 [formerly 5c5e3605e7] [formerly 92b83788e4 [formerly 5c5e3605e7] [formerly 43f18d2770 [formerly 7b2bd85ea00ab8030f5577b945c6c716e1da6dc4]]]
Former-commit-id: 43f18d2770
Former-commit-id: cfa02f4076 [formerly 38dd19134d]
Former-commit-id: a4207cfb7a
2014-05-27 15:08:37 -05:00
Fay.Liang
b1f0d4db14 ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a

Former-commit-id: d57ebaad64 [formerly 0b9a011c58] [formerly d57ebaad64 [formerly 0b9a011c58] [formerly f56d9511b8 [formerly 445239c00cbe2147c014e180570085be6224da79]]]
Former-commit-id: f56d9511b8
Former-commit-id: 1411895d5d [formerly b77277b80e]
Former-commit-id: 247f3817be
2014-05-27 16:04:22 -04:00
David Friedman
9240b52ae4 Merge "ASM #512 - Need radar data watchdog functionality" into asm_14.3.1
Former-commit-id: 2566b64668 [formerly a57e547697] [formerly 2566b64668 [formerly a57e547697] [formerly 602150ea73 [formerly 9de711dfd85512d7bbdee2c91132d5250373c676]]]
Former-commit-id: 602150ea73
Former-commit-id: 8e0ec97eff [formerly c7eb18fc66]
Former-commit-id: 0c84a74214
2014-05-27 15:03:48 -05:00
Daniel.Huffman
4fc007a417 ASM #512 - Need radar data watchdog functionality
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3

Former-commit-id: 343046c159 [formerly eab2733238] [formerly 343046c159 [formerly eab2733238] [formerly 8326f42ed8 [formerly b3f33a3c49607219a234bede34bd983178151f39]]]
Former-commit-id: 8326f42ed8
Former-commit-id: 1bd20432a3 [formerly b63c845a2b]
Former-commit-id: 0503a4f11d
2014-05-27 19:59:53 +00:00
Greg Armendariz
1a976cb67b Omaha #3215 - Add option for RPM build,
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5

Former-commit-id: 0806135d2e [formerly 265a455ca1] [formerly 0806135d2e [formerly 265a455ca1] [formerly a2e157ed35 [formerly 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b]]]
Former-commit-id: a2e157ed35
Former-commit-id: db01c4b45e [formerly 81ca8ed4c6]
Former-commit-id: bdbdfdaa7a
2014-05-27 14:56:33 -05:00
Nate Jensen
35a823fe04 Merge "Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version." into omaha_14.4.1
Former-commit-id: b60ef3fbc6 [formerly e945207c1d] [formerly b60ef3fbc6 [formerly e945207c1d] [formerly 6d717294d8 [formerly 4f50b471f3f841e0cad14957ef1daec79afbe2b3]]]
Former-commit-id: 6d717294d8
Former-commit-id: 03ba03a127 [formerly 9bc8d4c025]
Former-commit-id: d4de00fbb2
2014-05-27 14:18:57 -05:00
Steve Harris
172cca39d9 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 3de24b7b07 [formerly 99bc6f990c] [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea [formerly 9b98b41cd4]
Former-commit-id: 144354c369
2014-05-27 14:48:24 -04:00
Nate Jensen
303c44e9df Merge "Omaha #2670 add support for data access framework to airep plugin." into omaha_14.4.1
Former-commit-id: 29a07790b8 [formerly 094d09c7c5] [formerly 29a07790b8 [formerly 094d09c7c5] [formerly 23e376f738 [formerly 00dae50c7c609a0ce07a5c155ffb6d6bee3d4c2f]]]
Former-commit-id: 23e376f738
Former-commit-id: 934e488ad4 [formerly 1da76e33f8]
Former-commit-id: 5e4b4aacb5
2014-05-27 13:42:20 -05:00
Ben Steffensmeier
baa31bc6fa Omaha #2670 add support for data access framework to airep plugin.
Former-commit-id: 80fa485848 [formerly a58bc7a8d4] [formerly 80fa485848 [formerly a58bc7a8d4] [formerly 46c69e7d74 [formerly 56c528cf5727954431298c955a506d54cd5921ad]]]
Former-commit-id: 46c69e7d74
Former-commit-id: a29c82ffea [formerly 101b7c3516]
Former-commit-id: cb589b7397
2014-05-27 13:38:09 -05:00
Bryan Kowal
cf8a8e4c6c Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version.
Rebased on re-compiled on the latest version of the nativeLib code.


Former-commit-id: 7341d90341 [formerly f1258ef865] [formerly 7341d90341 [formerly f1258ef865] [formerly c711ab9195 [formerly b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a]]]
Former-commit-id: c711ab9195
Former-commit-id: 1e983fbf3f [formerly e387f50206]
Former-commit-id: 3fd9da7e49
2014-05-27 13:16:37 -05:00
Slav Korolev
bcc5a458b3 Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
Former-commit-id: adba0cd20a [formerly e3fe3c9736] [formerly adba0cd20a [formerly e3fe3c9736] [formerly 81033087ea [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]]
Former-commit-id: 81033087ea
Former-commit-id: 55b01dce6d [formerly 4a8e7fc38e]
Former-commit-id: ced313a7f1
2014-05-27 12:24:50 -04:00
Brian Clements
a7c2ce9095 Omaha #3152 switched radar server to use logback instead of log4j
removed unneeded custom rolling file appender
replaced log4j config with logback config


Former-commit-id: f84333e1ce [formerly f6e7dffe61] [formerly f84333e1ce [formerly f6e7dffe61] [formerly 132bd3948d [formerly ae91e2e2069f73bc661d0009a5d5c083a9d2a229]]]
Former-commit-id: 132bd3948d
Former-commit-id: e93c91abf6 [formerly b79a9a9e51]
Former-commit-id: 040284c727
2014-05-27 11:11:12 -05:00
Brian Clements
d75008101f Omaha #3206 added version to servlet api in cave feature
without this, the build prefers the javax.servlet in the target platform

Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80

Former-commit-id: f0e8bf76a9 [formerly 6f76a9a328] [formerly f0e8bf76a9 [formerly 6f76a9a328] [formerly 2fd2b5aa16 [formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]]]
Former-commit-id: 2fd2b5aa16
Former-commit-id: 170e3644f2 [formerly af8a6806f0]
Former-commit-id: e88d9a2e8c
2014-05-23 17:04:49 -05:00
Brian Clements
d63e1eaa22 Omaha #3199 new edex.soap plugin
new plugin for soap utilities


Former-commit-id: a94cf29ab5 [formerly 4b984b2d70] [formerly a94cf29ab5 [formerly 4b984b2d70] [formerly 09fba26a56 [formerly 7c7f7f4f4a821a80d0bf6dcb7e59e3880a7bf4e2]]]
Former-commit-id: 09fba26a56
Former-commit-id: a02928d703 [formerly f934e868ec]
Former-commit-id: 161a6b1624
2014-05-23 14:51:20 -05:00