From 4e2ce23e434fad524f29c39b5800c917a5e80d70 Mon Sep 17 00:00:00 2001
From: Jason Yellick <jyellick@us.ibm.com>
Date: Wed, 20 Feb 2019 14:08:40 -0500
Subject: [PATCH] FAB-14271 Add channel policies to channel config

Previously, configtxgen would auto-populate policies if they were
omitted.  This presented some problems for specifying partial policy
schemes, like only overriding one policy.  Support for omitting policies
was deprecated in v1.3 and has been removed for v2.0.0.

Change-Id: Ie01bf8f05911358a0af144f2fe2df2667c2bf12e
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
---
 first-network/configtx.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/first-network/configtx.yaml b/first-network/configtx.yaml
index 3d29ebfce0..23025238b4 100644
--- a/first-network/configtx.yaml
+++ b/first-network/configtx.yaml
@@ -314,6 +314,7 @@ Profiles:
                     - *Org2
     TwoOrgsChannel:
         Consortium: SampleConsortium
+        <<: *ChannelDefaults
         Application:
             <<: *ApplicationDefaults
             Organizations:
@@ -345,4 +346,4 @@ Profiles:
             SampleConsortium:
                 Organizations:
                 - *Org1
-                - *Org2
\ No newline at end of file
+                - *Org2