Commit graph

2234 commits

Author SHA1 Message Date
Bryan Kowal
27aa8b21f4 Issue #1661 - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: a6cd17feeb [formerly c55efaadb0 [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]
Former-commit-id: c55efaadb0
Former-commit-id: 541d096faf
2013-03-25 15:23:31 -05:00
Richard Peter
a43becec4f Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development
Former-commit-id: 3239c176fa [formerly 7b8931ed16 [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]
Former-commit-id: 7b8931ed16
Former-commit-id: c7dd6365d2
2013-03-25 14:45:06 -05:00
Richard Peter
e492d8c351 Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development
Former-commit-id: 3de0400969 [formerly 1b7e9e41ce [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]
Former-commit-id: 1b7e9e41ce
Former-commit-id: bb2be2d6a7
2013-03-22 16:26:52 -05:00
Dustin Johnson
b1f365220f Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
Former-commit-id: 8651ca3d76 [formerly dcfbb43eb3 [formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]
Former-commit-id: dcfbb43eb3
Former-commit-id: f5cc517f9a
2013-03-22 15:28:57 -05:00
Dustin Johnson
efb12ce258 Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
Former-commit-id: ed017996a0 [formerly 11478e870d [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]
Former-commit-id: 11478e870d
Former-commit-id: ec42bd63ad
2013-03-22 15:28:20 -05:00
Max Schenkelberg
2da689223f Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 126be0cfe5 [formerly ea26d0de84 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]
Former-commit-id: ea26d0de84
Former-commit-id: 07ae94c499
2013-03-22 10:54:44 -05:00
Dustin Johnson
34b969552f Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 04cbd3a24e [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]
Former-commit-id: 8956d1ac17
Former-commit-id: 6fc42b0791
2013-03-22 10:04:21 -05:00
Richard Peter
d6a8b05c22 Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: 4c3fcf3b67 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]
Former-commit-id: 9fdeb37a48
Former-commit-id: ead48007cb
2013-03-21 18:21:53 -05:00
Nate Jensen
d10c11ccd2 Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development
Former-commit-id: 44f8ba8943 [formerly e4c1e86d55 [formerly 805fae0df3b82e1e16a931741d22bf7637e6aa06]]
Former-commit-id: e4c1e86d55
Former-commit-id: 5728a3e5b6
2013-03-21 17:06:37 -05:00
Dustin Johnson
ace2e517d5 Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
Amend:
  Add constant for "CAVE".
  Add preconditions on creating a subscription.

Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae

Former-commit-id: c4d4e37cad [formerly f8870c8946 [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]
Former-commit-id: f8870c8946
Former-commit-id: bd58534855
2013-03-21 16:14:49 -05:00
Nate Jensen
e4d8b23294 Merge "Issue #1808 perspective specific actions take priority" into development
Former-commit-id: 255b2dbd29 [formerly d6d7b081cf [formerly 0c710437147f3a1b242f93a4c63c2451d5724f3e]]
Former-commit-id: d6d7b081cf
Former-commit-id: 113da23467
2013-03-21 15:07:57 -05:00
Greg Armendariz
65d6bc8cd7 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
Former-commit-id: 85113a66b6 [formerly 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]]
Former-commit-id: 6af1a22e56
Former-commit-id: 1e1aea8a40
2013-03-21 12:55:59 -05:00
Dustin Johnson
9818775763 Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
Former-commit-id: c2373812bd [formerly 54bbf500de [formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]]
Former-commit-id: 54bbf500de
Former-commit-id: a93b6f54c0
2013-03-21 12:35:40 -05:00
Dustin Johnson
e8c9726d51 Issue #1794 Use a queue to hold ncf retrieval transfers
Amend:
  Peer review comments

Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21

Former-commit-id: ebce91c15d [formerly b29eb94780 [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]]
Former-commit-id: b29eb94780
Former-commit-id: 3d87218f1a
2013-03-21 12:28:00 -05:00
Bryan Kowal
2395ca0b3b Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 5b15c6fcaa [formerly 4e37fa6627 [formerly b756d55e91a553623fb61de2673f87d81351ca9b]]
Former-commit-id: 4e37fa6627
Former-commit-id: 574f6cf4ad
2013-03-21 10:04:29 -05:00
Bryan Kowal
0ef2ee6e49 Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]
Former-commit-id: ab135933da
Former-commit-id: 4d3731bf6d
2013-03-21 09:50:48 -05:00
Max Schenkelberg
1cc836611f Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator.
Amend: Added header comments and more unused code

Change-Id: Ib9285d0472e41473ba79bbada8ea2bf57b55d686

Former-commit-id: 5109641194 [formerly b2e374c7fb [formerly e40808621cfee3cabe6b6cf124440632ef08d5d7]]
Former-commit-id: b2e374c7fb
Former-commit-id: 3bda2ba497
2013-03-20 17:38:02 -05:00
Bryan Kowal
cbffb4df4a Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
Former-commit-id: 3baebb684b [formerly 0479eb0cc1 [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]
Former-commit-id: 0479eb0cc1
Former-commit-id: 820518ffb9
2013-03-20 16:53:18 -05:00
Nate Jensen
9ff2d78022 Issue #1808 perspective specific actions take priority
Change-Id: I21f5515fe0c2a480dee9950bacbc2b06fd084072

Former-commit-id: de3aea9afb [formerly c1ddc02b10 [formerly d69f2087948a54618c6f22878d575b6760950909]]
Former-commit-id: c1ddc02b10
Former-commit-id: 00f750ae06
2013-03-20 16:27:31 -05:00
Steve Harris
b7994fb77b Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]
Former-commit-id: e2496455b2
Former-commit-id: 0055a3213d
2013-03-20 16:09:26 -05:00
Steve Harris
ea052b14bb Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: fa15f03e1b
Former-commit-id: a9ced3a7ef
2013-03-20 16:06:20 -05:00
Steve Harris
76ea9120d8 13.3.1-10 baseline
Former-commit-id: 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 073687d9a9
Former-commit-id: 57f4676b6c
2013-03-20 15:53:01 -05:00
Max Schenkelberg
9f4b102dc7 Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e

Former-commit-id: 26cfcd2af5 [formerly c6db3ce43b [formerly d9cc808839d4a3210381329eec4f73e061be9968]]
Former-commit-id: c6db3ce43b
Former-commit-id: 43341e7ad3
2013-03-20 14:10:52 -05:00
Steve Harris
8db22baf07 Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]
Former-commit-id: 36df63be5c
Former-commit-id: 310474ae9b
2013-03-20 13:45:11 -05:00
Richard Peter
0d35db042e Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: adbe7b91cc [formerly 3b8e2ff0d3 [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]
Former-commit-id: 3b8e2ff0d3
Former-commit-id: d1e37c7803
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
41372ac122 Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: 82499f839d [formerly ee7204c05c [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]
Former-commit-id: ee7204c05c
Former-commit-id: 1203b7cee4
2013-03-20 13:26:33 -05:00
Dustin Johnson
28cd17759e Merge "Issue #1796 updated some headers, general cleanup" into development
Former-commit-id: e7bfdebd41 [formerly e5bcff21cb [formerly 327283da3d779b976d1fdc118c74f00047d79062]]
Former-commit-id: e5bcff21cb
Former-commit-id: d584a7fb38
2013-03-20 13:17:10 -05:00
Ben Steffensmeier
0d765a2fcf Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]
Former-commit-id: 2b6aa86371
Former-commit-id: 0d9119a1c7
2013-03-20 13:05:54 -05:00
Dave Hladky
2cfb8f5ee0 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 90f7f2110b
Former-commit-id: dc7b231bf0
2013-03-20 12:41:33 -05:00
Dave Hladky
c0250bb4e0 Issue #1796 updated some headers, general cleanup
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6

Former-commit-id: 38494cec16 [formerly 5362771743 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]
Former-commit-id: 5362771743
Former-commit-id: 958b897c21
2013-03-20 12:17:08 -05:00
Richard Peter
d58ec843d1 Merge "Issue #1807 Change DbQueryHandler to include order by informaton in the query." into development
Former-commit-id: 4ffeeded42 [formerly 15c2a0af44 [formerly 69adcef125ce7e9902eb2b0fb42e3bf517e87264]]
Former-commit-id: 15c2a0af44
Former-commit-id: 0bb02996e4
2013-03-20 10:01:51 -05:00
Greg Armendariz
197c99e347 Merge "Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base" into development
Former-commit-id: 82af4a9f5c [formerly 65e9035d82 [formerly 5c1da36c644f12bda81686365de72785b1eb8bc6]]
Former-commit-id: 65e9035d82
Former-commit-id: ffb307c7b3
2013-03-20 09:55:49 -05:00
Dave Hladky
b6e4db814b Issue #1796 Fixed the test
Change-Id: I97c130659910d11d2b1a26d888871b6a48bd5f2c

Former-commit-id: b4eb7b17a9 [formerly d9078b438a [formerly e5648a32e688c0b23233ab46e0c9f32b3bf2920f]]
Former-commit-id: d9078b438a
Former-commit-id: a624cc49c7
2013-03-19 17:22:00 -05:00
Roger Ferrel
8a26c52506 Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 4f889b6999 [formerly b32ac22ef8 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]]
Former-commit-id: b32ac22ef8
Former-commit-id: 3acca75f82
2013-03-19 16:24:22 -05:00
David Gillingham
3ad6035189 Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434.
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9

Former-commit-id: 8ea6d7227b [formerly 843f474af8 [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]
Former-commit-id: 843f474af8
Former-commit-id: ab6944650a
2013-03-19 16:06:25 -05:00
Richard Peter
7d0568efed Merge "Issue #1804 Cache db queries in radar decoder. Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be" into omaha_13.3.1
Former-commit-id: a421cfe73e [formerly 6046872ab5 [formerly d17f8b4df74b52f703636d253c25aa4db73dfc6d]]
Former-commit-id: 6046872ab5
Former-commit-id: 26aa93a6f4
2013-03-19 15:34:36 -05:00
Steve Harris
6ebecda008 13.3.1-9 baseline
Former-commit-id: f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: 468ae82305
Former-commit-id: c7b2ef2d8c
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
f828c49328 Issue #1804 Cache db queries in radar decoder.
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: 5d2d834cf7 [formerly 7b83f6bdfa [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]
Former-commit-id: 7b83f6bdfa
Former-commit-id: 337e450f94
2013-03-19 14:11:36 -05:00
Bryan Kowal
fa0f882050 Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
Former-commit-id: 74b4bb0891 [formerly cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]
Former-commit-id: cbe9b30266
Former-commit-id: 448518579a
2013-03-19 13:27:38 -05:00
Richard Peter
47a74b9867 Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 3a92747518 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]
Former-commit-id: 4ce10bced9
Former-commit-id: 2fdbc96342
2013-03-19 13:24:28 -05:00
Dustin Johnson
d1789b5141 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
Former-commit-id: 8363eba409 [formerly 5b4035fb11 [formerly 9761b41160000713d00113c5267badafc9613a0d]]
Former-commit-id: 5b4035fb11
Former-commit-id: bc323d3f25
2013-03-19 13:09:48 -05:00
Dave Hladky
77472f704f Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: 81ad1ce2ed [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]
Former-commit-id: ddb23ae59f
Former-commit-id: d7e8709cde
2013-03-19 13:08:14 -05:00
Mike Duff
361434a64f Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 058064ce0d [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]
Former-commit-id: b115d3611c
Former-commit-id: 70efff8f0a
2013-03-19 10:10:01 -05:00
Bryan Kowal
72bdbbb7f6 Issue #1805 - slightly modified viz feature build order
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: f0eb7d3285 [formerly f325038538 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]
Former-commit-id: f325038538
Former-commit-id: 6106369d4c
2013-03-18 18:15:26 -05:00
Ben Steffensmeier
be721b7da0 Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: 86dffab17d [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]
Former-commit-id: 6c741a9ab3
Former-commit-id: 7b7b708eee
2013-03-18 17:16:44 -05:00
Steve Harris
b64fbe549a Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: b8f0635ad6
Former-commit-id: 28ef804e1b
2013-03-18 16:52:00 -05:00
Steve Harris
3e69490ab2 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: 1a999fee5a
Former-commit-id: 27c418812f
2013-03-18 16:43:22 -05:00
Bryan Kowal
4f808edba3 Issue #1741 - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]
Former-commit-id: b954bc17bf
Former-commit-id: a93dcff1b5
2013-03-18 16:36:33 -05:00
Steve Harris
dd30a5f940 13.3.1-8 baseline
Former-commit-id: c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: f97d78994b
Former-commit-id: bc9df0a8f9
2013-03-18 15:43:32 -05:00
Dustin Johnson
1fb27b205a Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
Former-commit-id: 7fe3c254fd [formerly b7a5311dde [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]
Former-commit-id: b7a5311dde
Former-commit-id: 36cc80590c
2013-03-15 16:14:17 -05:00