Commit graph

2540 commits

Author SHA1 Message Date
Mike Duff
0672db6081 Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 9a2d2af4a9 [formerly bdf6a002f6 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: 7e3e76e9da [formerly e929abf7d7] [formerly d100328be0c1140a5b43dcb2f41ad9e6ab41095e [formerly 9112366cae]]
Former-commit-id: d799b7c4eda4917284ed7af90a20dbf028cb2301 [formerly 8844bbbe2d]
Former-commit-id: e8d473b9c6
2014-01-20 17:44:02 -06:00
Lee Venable
4bdf61e5c8 Merge "Issue #2291 - Fixed resizing of components." into omaha_14.2.1
Former-commit-id: c3022f8274 [formerly d825d627bd] [formerly b3928f4f49] [formerly c3022f8274 [formerly d825d627bd] [formerly b3928f4f49] [formerly dd12515ca2 [formerly b3928f4f49 [formerly 277513c8d810a3996d93fd04a5691eb730c78630]]]]
Former-commit-id: dd12515ca2
Former-commit-id: b40ae43582 [formerly 82eafd385d] [formerly 4206ad0dee836a41182154fcefd07a187f71acab [formerly 4e121d1261]]
Former-commit-id: e8ca26070331c161e10162a907845e0d45540ed2 [formerly edab55763c]
Former-commit-id: 916f05e2bd
2014-01-20 17:32:38 -06:00
Nate Jensen
c05a8445aa Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1
Former-commit-id: 55203d0486 [formerly c598185130] [formerly d78dbb85d5] [formerly 55203d0486 [formerly c598185130] [formerly d78dbb85d5] [formerly 54262ad318 [formerly d78dbb85d5 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]]]
Former-commit-id: 54262ad318
Former-commit-id: c2340dfd07 [formerly 5b84b27087] [formerly 3b53bce38675c75e649c3c5c70ab3876d1503296 [formerly f13cb9ae26]]
Former-commit-id: 787abc1e824a9e298d32cfcb5fc6c03b5dcb589c [formerly 1ee13de1db]
Former-commit-id: 8c247a36e6
2014-01-20 17:32:15 -06:00
Lee Venable
36195992bd Issue #2291 - Fixed resizing of components.
Former-commit-id: ea96ce87e9 [formerly 39e8124ef7] [formerly 1927ba49ea] [formerly ea96ce87e9 [formerly 39e8124ef7] [formerly 1927ba49ea] [formerly d3eb6c16ec [formerly 1927ba49ea [formerly 9956936125611cd67aaaf6ba6e617e01b004a738]]]]
Former-commit-id: d3eb6c16ec
Former-commit-id: 9ecbd3bc7a [formerly dad11aca88] [formerly 3951681cd94fb490f91e2f28a8cc25e01dca0872 [formerly b8520d1e12]]
Former-commit-id: 01a9b6f90dbcee7c5d6fccf8f0fae83e9311a50b [formerly 9bf640f116]
Former-commit-id: 19d90c676f
2014-01-20 17:26:28 -06:00
Ron Anderson
643c0819b1 Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly 66bbc99784 [formerly de97ec032f [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]]
Former-commit-id: 66bbc99784
Former-commit-id: 9b8c8310ab [formerly 0048ef6a96] [formerly c83a8b6d3a8111365ba2ad52fdb151f0a5cec621 [formerly 61d8aec23c]]
Former-commit-id: 52bde166e586e19680a1aa9f75a55d0e29557a25 [formerly 841504f145]
Former-commit-id: 385547a5e5
2014-01-20 17:22:26 -06:00
Richard Peter
caf9de2ed6 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 29ba337367 [formerly 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]]
Former-commit-id: 29ba337367
Former-commit-id: fa5e160245 [formerly 4796beec29] [formerly 4d7e2eae126edb00fa4f829dd78950b4c1bcb955 [formerly 4887054146]]
Former-commit-id: d0dd309b0a417a6444396ea3b859924e5cfdca56 [formerly b147653a66]
Former-commit-id: d0ef42d528
2014-01-20 17:21:21 -06:00
Steve Harris
f8496662a0 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3 [formerly 7ea285c48b] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb]
Former-commit-id: ccd2f6cdaa
2014-01-20 10:17:44 -06:00
Mike Duff
67bab78c2f Issue #2459 - Remove unscheduled status from UI
Former-commit-id: e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: 5097ed2ad7 [formerly a492ec6a4d] [formerly 77ea703f0626d7ff1caa2689bf5deb3e8b0b0c00 [formerly a04430e334]]
Former-commit-id: 8d18315d712b7d954433a4d91c196a329a74eeaa [formerly dcb5b4a111]
Former-commit-id: 45bef29f75
2014-01-17 15:34:48 -06:00
Nate Jensen
9081058ca2 Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 9d529b3b21 [formerly ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 9f4360fdda [formerly 98e1bf9194] [formerly 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6]]
Former-commit-id: d4f72fd00fd9496a9587b235b75d9efcd7bc6b81 [formerly 3d6d9118ea]
Former-commit-id: 86b9311ed4
2014-01-15 17:36:30 -06:00
Nate Jensen
96501f3ee6 Issue #2359 printout connection exceptions to aid in diagnosing
connectivity problems

Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c

Former-commit-id: aa0639a878 [formerly ccaa9dbde1] [formerly fc6b31c1c0] [formerly aa0639a878 [formerly ccaa9dbde1] [formerly fc6b31c1c0] [formerly 5f39322d59 [formerly fc6b31c1c0 [formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]]
Former-commit-id: 5f39322d59
Former-commit-id: 472cf2905c [formerly 4533642f26] [formerly 6ed8c7d69c73010ecba0450f2c9d1203bc9f3ab4 [formerly deb57e3b35]]
Former-commit-id: 2fda878e376a0359217f3278b54cbfd5b9f6ba63 [formerly fd32fb6c6e]
Former-commit-id: 2ff7910650
2014-01-15 13:39:28 -06:00
Mike Duff
5ea95dbca9 Issue #2459 - Refactor the subscription status
Former-commit-id: 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 245d76358e [formerly f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]]
Former-commit-id: 245d76358e
Former-commit-id: c5f28e0f37 [formerly 9a45b95db6] [formerly ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937]]
Former-commit-id: 86f4629abcfe03116c78ec209c22d6df91eac0b9 [formerly 3c0634b1e8]
Former-commit-id: c8f7edbcad
2014-01-15 09:21:30 -06:00
Ron Anderson
f33f5aec85 Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f]
Former-commit-id: 77c132f706
2014-01-13 17:45:20 -06:00
Richard Peter
35aff78756 Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 7bbefddcc1 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]]
Former-commit-id: e6d7acb609
Former-commit-id: 1e10acc664 [formerly 5b687c7bd5] [formerly 08b064f5627b0585a3df75b960a722fde7817d6f [formerly 527408ddd4]]
Former-commit-id: 0d5015fa8d377254f6d7ba50cf3545c4029a7b43 [formerly b14835bae6]
Former-commit-id: d047e8210a
2014-01-10 15:42:48 -06:00
Mike Duff
6467415631 Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 69ca0dd0d2 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]]
Former-commit-id: 7081c26823
Former-commit-id: c8885b34f1 [formerly b616f34af2] [formerly e5367b16239e543229d0aace6c8f70b5970faf5e [formerly 17d19cc0bb]]
Former-commit-id: 27bd74b3d39111665cada21d7ce2034177a0ed3b [formerly c1e3dd57b6]
Former-commit-id: 0823eab3bf
2014-01-10 12:05:30 -06:00
Mike Duff
fa2d6a608f Issue #2642 - Update header comment
Former-commit-id: b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly 28114764a5 [formerly 101d9939d6 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]]
Former-commit-id: 28114764a5
Former-commit-id: 5f19ccc46e [formerly 12c47ea375] [formerly 32bb19308f502de6a22ca9009876c463c872be8c [formerly 7d25b33cb6]]
Former-commit-id: a84c6000a796403c7b1ca87aa3d889b74de0ab97 [formerly 2906b0bed2]
Former-commit-id: ca2667855c
2014-01-10 10:57:18 -06:00
Richard Peter
b96f5d0716 Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 52850fe95a [formerly 8ca1217f03 [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]]
Former-commit-id: 52850fe95a
Former-commit-id: a25ad86347 [formerly b833c4333c] [formerly 766dc3d39c99f73f010de1c29095aef2b852645e [formerly 690f1b15dd]]
Former-commit-id: eb0676b7f5eb5f662c1df67b863f2502f758d1d2 [formerly fd7fde3cdf]
Former-commit-id: e60037e842
2014-01-09 16:58:39 -06:00
Richard Peter
8d42e74a87 Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
Former-commit-id: a39f2bff20 [formerly 0bd52b65e7] [formerly b711c35c68] [formerly a39f2bff20 [formerly 0bd52b65e7] [formerly b711c35c68] [formerly f45a281935 [formerly b711c35c68 [formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]]
Former-commit-id: f45a281935
Former-commit-id: a2eef48cfb [formerly f4108b8be2] [formerly 8e88f0da68170bd6d7f37b03b43ebe72c7b0e3e4 [formerly 0459cd237e]]
Former-commit-id: 98a72493ef8349f29fdc28306a758f45155b90c1 [formerly 5bb2869ca4]
Former-commit-id: 255358f37a
2014-01-09 16:53:52 -06:00
Mike Duff
feea2738ac Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible.
Former-commit-id: 41ac6a70dd [formerly e4f56affd3] [formerly 16a8f16ee4] [formerly 41ac6a70dd [formerly e4f56affd3] [formerly 16a8f16ee4] [formerly 9b5adfaba2 [formerly 16a8f16ee4 [formerly 87dd0df07a9ef0e7881ed0cf7b8aa1d41f0c9d4d]]]]
Former-commit-id: 9b5adfaba2
Former-commit-id: 2a94a50ec8 [formerly d2f74b6238] [formerly c5a413c1f93f4b03121d44e01630e558a6904c48 [formerly 7a1712acd6]]
Former-commit-id: 7a3ca1247d56bf009f61686163125965713717c9 [formerly 698a84e1f3]
Former-commit-id: 04646a9a21
2014-01-09 13:02:08 -06:00
Mike Duff
8325995f25 Issue #2643 - Fixed the mouse checking on DD maps
Former-commit-id: 3d962a5425 [formerly 7b8964d9b2] [formerly 4fe2dc76af] [formerly 3d962a5425 [formerly 7b8964d9b2] [formerly 4fe2dc76af] [formerly 56499a77c3 [formerly 4fe2dc76af [formerly 775e99924e098387e4ca5042823ef20d1a0d2afe]]]]
Former-commit-id: 56499a77c3
Former-commit-id: ff76fa081c [formerly 1c3b700563] [formerly 276825c6d8c7a85fe6b1be0854404a47fc47b5c8 [formerly 09c5f29395]]
Former-commit-id: 00712e3b935d928b948d234a7ffef8fa226648bf [formerly 94848592d1]
Former-commit-id: 901838b7d3
2014-01-09 10:18:34 -06:00
Mike Duff
f0a3521e6f Issue #2642 - Make shared sub deletions remove the site from the list
Former-commit-id: 7720852347 [formerly 0cb61d4d50] [formerly 6cff7aaf0c] [formerly 7720852347 [formerly 0cb61d4d50] [formerly 6cff7aaf0c] [formerly 4e6b4eaa4c [formerly 6cff7aaf0c [formerly a8f57c338a8a06c6d40842f56c329fd9f215bc5b]]]]
Former-commit-id: 4e6b4eaa4c
Former-commit-id: 1c60e6e7cc [formerly 0e081e8ee2] [formerly 87757eade8f87fee23058c260317eed10f66609c [formerly fdef5e97e2]]
Former-commit-id: c4188f5b4fa1a7fc6a8f16891654de02ee97ed09 [formerly 49dc635963]
Former-commit-id: 194a348ce2
2014-01-09 10:15:48 -06:00
Ben Steffensmeier
0be4f6aa10 Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: 08c9b54e49 [formerly f516a684d4] [formerly f520a26fbd] [formerly 08c9b54e49 [formerly f516a684d4] [formerly f520a26fbd] [formerly d79f804d4e [formerly f520a26fbd [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]]
Former-commit-id: d79f804d4e
Former-commit-id: 4b43971a78 [formerly 9913e51429] [formerly b2807282541cba1b6dadcac12cda1996f7292656 [formerly fac9fd296f]]
Former-commit-id: 7d14b369cda7d14c9c1a9fb5e2be6d7759dd73e3 [formerly 4fef47c0a8]
Former-commit-id: 7303bd3b62
2014-01-06 16:02:59 -06:00
Steve Harris
e44faa7943 14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]]
Former-commit-id: d8e5799328
Former-commit-id: 188b12a1b0 [formerly 282d10fe6d] [formerly 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281]]
Former-commit-id: 86d049732a94fe967ea42eb6fadaec484ef0117f [formerly cd4a09623c]
Former-commit-id: 1ca553385c
2014-01-06 14:08:08 -05:00
Steve Harris
f8f17037ca 14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6 [formerly 0989c17710] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1]
Former-commit-id: 5862555160
2014-01-06 14:02:30 -05:00
David Gillingham
ec522d0ee0 Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: ab3f8b200a [formerly c48c0523ff] [formerly 136265183d] [formerly ab3f8b200a [formerly c48c0523ff] [formerly 136265183d] [formerly 09bfdc49e3 [formerly 136265183d [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: f4dfa0efb1 [formerly 6e642b81fe] [formerly 54ef06cbf4b4c0bf6f652f24388beb4dfdf1db37 [formerly 8f3802eecf]]
Former-commit-id: 01fe09b5b4718cd40ed3a2ba5206139e1de68dcb [formerly 24c8fc930e]
Former-commit-id: 203e25ab3c
2013-12-18 16:18:47 -06:00
Richard Peter
08d2290f97 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
2013-12-17 21:04:53 -06:00
Mike Duff
8d04d1c8e9 Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
Former-commit-id: c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly 6406bcdd05 [formerly 66f5585774 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]]
Former-commit-id: 6406bcdd05
Former-commit-id: ca4bb45e94 [formerly 0232f16e7a] [formerly dc31710b1c3cf0e82793c4e06ce4b433634d350a [formerly 54f7feef03]]
Former-commit-id: 8772cea891664095b1629a3cbe927489ed48e4c5 [formerly b54ab4df6a]
Former-commit-id: 707ac59a98
2013-12-17 09:41:30 -06:00
Bryan Kowal
c8e49142f2 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4 [formerly 68181d3f62] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8]
Former-commit-id: fad82481c1
2013-12-16 16:39:10 -06:00
Lee Venable
b261eca351 Issue #2583 - Procedure dialog fixes and clean up.
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10

Former-commit-id: 197a8b5508 [formerly d6eb7534f5] [formerly aa0e9121f8] [formerly 197a8b5508 [formerly d6eb7534f5] [formerly aa0e9121f8] [formerly 7ee6053c22 [formerly aa0e9121f8 [formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]]
Former-commit-id: 7ee6053c22
Former-commit-id: df1150692d [formerly d05d650430] [formerly 0af2a615c742e34adbdfd0a6913eb7d563f108fa [formerly f3c8b69e2e]]
Former-commit-id: fceb656ed374738175ac7491413c6069f1d1b881 [formerly b7d5aa748a]
Former-commit-id: b95b380eb2
2013-12-12 16:15:56 -06:00
Steve Harris
e242b041ad 14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890]
Former-commit-id: 800136d61b
2013-12-12 16:59:57 -05:00
Ben Steffensmeier
dc1d7cc834 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: c92b5842ab [formerly bf508b4455] [formerly a37db9d1b4] [formerly c92b5842ab [formerly bf508b4455] [formerly a37db9d1b4] [formerly 922674273e [formerly a37db9d1b4 [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]]
Former-commit-id: 922674273e
Former-commit-id: f62b7011b7 [formerly 0fb85fe4aa] [formerly 7b5206504ecad1e36005120b31bf8d5def0e3bf5 [formerly 4a86c90bfc]]
Former-commit-id: ef2c2b7d0102cc8ede2fad2eb721352ddceb079c [formerly b3ef07794a]
Former-commit-id: df1bc54013
2013-12-11 12:45:11 -06:00
Slav Korolev
153d7ad006 Issue #2570. Show All subscriptions in Subscription manager.
Former-commit-id: 51c0f8f92f [formerly 85bc26b5a3] [formerly b59e9499d2] [formerly 51c0f8f92f [formerly 85bc26b5a3] [formerly b59e9499d2] [formerly 67e18055cc [formerly b59e9499d2 [formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]]
Former-commit-id: 67e18055cc
Former-commit-id: c1b72b0e10 [formerly 746157755b] [formerly 9efd61bf39542c3ae92ed81de94a71f51cb52f27 [formerly 6811b0e5c1]]
Former-commit-id: 4d5b106a8fa995a056cf74463eea67301cb2a0db [formerly 04bc1a3052]
Former-commit-id: 65720fea82
2013-12-11 08:57:13 -05:00
Mike Duff
60a3267f91 Issue #2601 - Fix NullPointerException.
Former-commit-id: 8b49b1dea7 [formerly 773e546f62] [formerly 9e9706f55f] [formerly 8b49b1dea7 [formerly 773e546f62] [formerly 9e9706f55f] [formerly d2fe42c27c [formerly 9e9706f55f [formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]]
Former-commit-id: d2fe42c27c
Former-commit-id: 24ae26ef90 [formerly 02bbd4eaa6] [formerly d6664cc0a8ed267b96caf4d313f4f99d96961e7e [formerly 32b468023d]]
Former-commit-id: 6d4a3d4e5921151b5a888e5bc86daea2a50ee08b [formerly dd1af02457]
Former-commit-id: bddf555eab
2013-12-10 09:03:42 -06:00
Lee Venable
54e6a2966b Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1
Former-commit-id: 77f637dff1 [formerly 997c575919] [formerly 249435f17c] [formerly 77f637dff1 [formerly 997c575919] [formerly 249435f17c] [formerly 2c6b4309f0 [formerly 249435f17c [formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: b342346474 [formerly 4850830125] [formerly 3186e75460a5b4acb8c484648f1f445e432dee15 [formerly cc7885610d]]
Former-commit-id: e223fbba6ede8a8a7283fdd9d05141d71618788d [formerly 291c7f95c4]
Former-commit-id: 099f3f504a
2013-12-09 09:51:41 -06:00
Mike Duff
ae342f5a43 Issue #2271 - Fix menu problem with previously selected points being selectable again
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee

Former-commit-id: e91227bad4 [formerly 850e4dfbde] [formerly 0a5f2e3484] [formerly e91227bad4 [formerly 850e4dfbde] [formerly 0a5f2e3484] [formerly ebc730ac2d [formerly 0a5f2e3484 [formerly 959fcd37424b6261606d2ae65663403764be9c39]]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 5299287b65 [formerly 1925177772] [formerly 10eeac71861238a8de2287ad168fcc62e2afd598 [formerly 4d210517bd]]
Former-commit-id: dec6566c173e4f7fff1a056f14a0c7192f0bbc0c [formerly 96de34b2c1]
Former-commit-id: 74b19522a2
2013-12-06 12:58:38 -06:00
Nate Jensen
84c16f84ac Issue #2599 fix constructor
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e

Former-commit-id: 899bc199bb [formerly ec6b5393ef] [formerly 9bff38e0d3] [formerly 899bc199bb [formerly ec6b5393ef] [formerly 9bff38e0d3] [formerly 41014a105d [formerly 9bff38e0d3 [formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]]
Former-commit-id: 41014a105d
Former-commit-id: 71bc390b4f [formerly e8f28c6799] [formerly 8c75e2081d678b06e6390ca47fa30f36b8fcd47a [formerly f3e455d1a3]]
Former-commit-id: 777c0919b634d84c4f042eb949a6e3019c76a259 [formerly eb68a1be85]
Former-commit-id: 907a6e3304
2013-12-06 12:35:22 -06:00
Ben Steffensmeier
e324a43104 Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 258988c269 [formerly 067c510315] [formerly 59c6a24b68] [formerly 258988c269 [formerly 067c510315] [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 59c6a24b68 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 57de1adb55 [formerly 899cb2628c] [formerly 0119ce6ac19df37c80d8dfefa6dbbff1e8a7d526 [formerly 99afa17fd2]]
Former-commit-id: 48272569ea237bbdd940ff601ceae5ae9469c967 [formerly c27934d7ad]
Former-commit-id: fe53e49cb3
2013-12-06 09:14:01 -06:00
Richard Peter
077ddd9818 Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly 6fde307f0a [formerly d0b50eee3c [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 3088533103 [formerly 45889cb80f] [formerly ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051]]
Former-commit-id: 714bcfc3b217ba5f4187ec79b31726d5a3bcf4c4 [formerly ef7ba1f1ee]
Former-commit-id: 8cde2b5e9d
2013-12-05 14:54:46 -06:00
Mike Duff
6bacb944fb Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly 0c452e2434 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]]
Former-commit-id: 0c452e2434
Former-commit-id: 802e0d360c [formerly 45cf9384d8] [formerly 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360]]
Former-commit-id: 6357394278816b4bba40d3a8336a9f549bcbbad8 [formerly d3c5ee0468]
Former-commit-id: 0885df1d3f
2013-12-05 13:35:31 -06:00
Nate Jensen
200183a10b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly ae0bd2a86f [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: ad2b7df40b [formerly 15fee953f5] [formerly e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35]]
Former-commit-id: 8d7ad4d8fd6c5d67b7d5e36dddea37c59b03c830 [formerly bd4e9158f0]
Former-commit-id: 9740b5349b
2013-12-05 12:59:58 -06:00
Richard Peter
f362062048 Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
84825d1841 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 318e48c945 [formerly 7c2a4ef72c] [formerly f682e66e9b] [formerly 318e48c945 [formerly 7c2a4ef72c] [formerly f682e66e9b] [formerly 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]]
Former-commit-id: 46a466497c
Former-commit-id: 6ebc4e5fbc [formerly fde968a834] [formerly a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d]]
Former-commit-id: 127df8be9a4be1f882d7db4b5b59fec0343ae2c3 [formerly 956e8b04f2]
Former-commit-id: 2eb9a45951
2013-12-05 10:54:28 -06:00
Lee Venable
c734fc4ad3 Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 93a5c3f746 [formerly 67accdb7e3] [formerly 4f1b663b37] [formerly 93a5c3f746 [formerly 67accdb7e3] [formerly 4f1b663b37] [formerly b7be687903 [formerly 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]]
Former-commit-id: b7be687903
Former-commit-id: 0a9dcb2cc4 [formerly 40dc07e0ff] [formerly 7f9e4e582c0c271e96b06859da97ccb310d3b7f3 [formerly 3a3333e4ec]]
Former-commit-id: 05a05f7fdac155b046e7212956138fe3b43c5264 [formerly 195162014d]
Former-commit-id: 0ef3c4386d
2013-12-05 08:30:28 -06:00
Lee Venable
d699aabd99 Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: d420f11832 [formerly 9c64148733] [formerly 266d4884da] [formerly d420f11832 [formerly 9c64148733] [formerly 266d4884da] [formerly a385ec612c [formerly 266d4884da [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]]]
Former-commit-id: a385ec612c
Former-commit-id: 35352350b7 [formerly cddca699c6] [formerly a8a45bbbf444fd2b11c872dd17abd893d3419ecd [formerly d433717c8c]]
Former-commit-id: 841ea7e4aafc68bfd0b91d31ddd1ac1567aa33a5 [formerly ef61348fb8]
Former-commit-id: 24102d052b
2013-12-05 08:25:46 -06:00
Ron Anderson
d3d2ea3745 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]]
Former-commit-id: 20eeb2796e
Former-commit-id: fb3b7b0a9f [formerly e30d6041ee] [formerly 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f]]
Former-commit-id: 89e88491b334d8f079138c920fd456262fa46656 [formerly 89e87a1683]
Former-commit-id: bbd7ea36a1
2013-12-04 17:10:48 -06:00
Steve Harris
31c94115c7 14.1.1-12 baseline
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 1e4b2bac7b [formerly 4e6f319422] [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]]
Former-commit-id: e177b16a88af27dc0abf4496fe58fbe454cfa8c9 [formerly 234ca267ed]
Former-commit-id: 60f062ea59
2013-12-04 16:47:59 -05:00
Ron Anderson
e3fc955e54 Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 21f431f203 [formerly a99197c5c2] [formerly 5277e256cdac93c4f9b0fa236643a91c2e6af6d3 [formerly 75d2dd7a29]]
Former-commit-id: 0193b4e72e257f2b7fccd9d06a481874e19ebeef [formerly 1988e86bbd]
Former-commit-id: 95d6bebb13
2013-12-04 15:29:28 -06:00
Nate Jensen
ef9d5e9f15 Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 020c4de47d [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 3c8d882681 [formerly 331df460ff] [formerly 18066d784d37837fbb075e69dd1c460fc818ba15 [formerly 78629260d9]]
Former-commit-id: baef817fbd402f74ebdcc42f8c8e67374bfa1bc3 [formerly 35abe8c3af]
Former-commit-id: b6f9b78e92
2013-12-04 11:54:11 -06:00
Dave Hladky
c9644b91ed Issue #2607 Fixed Nullpointer
Former-commit-id: 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 25ce37d2d8 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]]
Former-commit-id: 25f745bc12
Former-commit-id: 085b6124b9 [formerly c93d7b57a1] [formerly 49cf33fb3030ab031805f86093adaaab234f3b6d [formerly b0f12b6613]]
Former-commit-id: d4b639f2168ea27ca32fecf44774479f0c1f770c [formerly 3cf23e1e4d]
Former-commit-id: 393d4a2967
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
e359c36fd8 Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 3c8962fb96 [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: 76c989a47d [formerly d6640590e9] [formerly a01200be83dcf0244764eae09c7c177e81901fa3 [formerly d1b4fdd9c8]]
Former-commit-id: 41865ec7e304f1812b2137c264a6494932b7e22b [formerly cb6d8f6070]
Former-commit-id: ea09aaff72
2013-12-04 11:22:47 -06:00
Nate Jensen
af6baf91c7 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly c29836abd7 [formerly cc53373478 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]]
Former-commit-id: c29836abd7
Former-commit-id: f2a827f884 [formerly cb3d6e2de3] [formerly 14135ca8d7f458242a1ad82bca5ddb70fc04057c [formerly bad9e2ab44]]
Former-commit-id: 197acb24ea07e1c4a72c16927485bb24f7b34c1c [formerly b58a9fbed7]
Former-commit-id: 92fb530969
2013-12-03 17:44:55 -06:00