Skip to content

Snap 2084 #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rishitesh merged 7 commits into from
Dec 28, 2017
Merged

Snap 2084 #86

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6c4083
[SNAp-2084] Added a check to set Snappy UMM if found in classpath.
Nov 14, 2017
78884fb
SparkEnv modified to set SnappyUMM if in classpath.
Nov 14, 2017
fb081c5
Merge branch 'snappy/branch-2.1' into SNAP-2084
Nov 27, 2017
f7a49b1
Merge branch 'snappy/branch-2.1' into SNAP-2084
Dec 18, 2017
9de66c9
Added spark header to avoid scalastyle error.
Dec 20, 2017
b9e1247
Changed based on review comments.
Dec 23, 2017
eb7a6a4
adding full copyright header.
Dec 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added spark header to avoid scalastyle error.
  • Loading branch information
rmishra committed Dec 20, 2017
commit 9de66c94ceb49199217bab597eb4c0792e5aba77
23 changes: 21 additions & 2 deletions core/src/main/scala/org/apache/spark/SparkSnappyUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
/*
* Copyright (c) 2017 SnappyData, Inc. All rights reserved.
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Changes for SnappyData data platform.
*
* Portions Copyright (c) 2017 SnappyData, Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You
Expand All @@ -8,12 +26,13 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied. See the License for the specific language governing
* permissions and limitations under the License. See accompanying
* LICENSE file.
*/

Copy link

@sumwale sumwale Dec 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the previous copyright header of SnappyData as owner was correct (filehdr.txt). Since this file is created in our repo only, so original copyright cannot be Apache's.

Copy link
Author

@rishitesh rishitesh Dec 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is with scala-style. I could not find a way to allow either-or kind of setting in scala style checker. It fails if not Apache.

Copy link

@sumwale sumwale Dec 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. Perhaps add full SnappyData header below instead of modification header.

Copy link
Author

@rishitesh rishitesh Dec 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

package org.apache.spark

import org.apache.spark.memory.MemoryManager
Expand Down